#48 Fix order of arguments

- remove "rewrite"
- in addressing a plyint message about `form_remap_dep`, I messed up the flow.cylc b/c the arguments were not in the right order (corrected!)

Author: Dana Singh

Jinja2Filters/form_remap_dep.py

@@ -22,13 +22,13 @@
 from pathlib import Path
 import yaml
 
-def rewrite_form_remap_dep(grid_type: str,
-                           temporal_type: str,
-                           chunk: str,
-                           pp_components_str: str,
-                           output_type: str,
-                           yamlfile: str,
-                           history_segment: str=None) -> str:
+def form_remap_dep(grid_type: str,
+                   temporal_type: str,
+                   chunk: str,
+                   pp_components_str: str,
+                   output_type: str,
+                   yamlfile: str,
+                   history_segment: str=None) -> str:
     """ 
     Form the task parameter list based on the grid type,
     the temporal type, and the desired pp component(s)

flow.cylc

@@ -306,16 +306,16 @@ rename-split-to-pp-native<native>
 {% endif %}
 
 {% if DO_REGRID %}
-{{ "regrid-xy" | form_remap_dep('temporal', PP_CHUNK_A, PP_COMPONENTS, 'ts', HISTORY_SEGMENT, YAML) }}
+{{ "regrid-xy" | form_remap_dep('temporal', PP_CHUNK_A, PP_COMPONENTS, 'ts', YAML, HISTORY_SEGMENT) }}
     {% if DO_TIMEAVGS %}
-{{ "regrid-xy" | form_remap_dep('temporal', PP_CHUNK_A, PP_COMPONENTS, 'av', HISTORY_SEGMENT, YAML) }}
+{{ "regrid-xy" | form_remap_dep('temporal', PP_CHUNK_A, PP_COMPONENTS, 'av', YAML, HISTORY_SEGMENT) }}
     {% endif %}
 {% endif %}
 
 {% if DO_NATIVE %}
-{{ "native" | form_remap_dep('temporal', PP_CHUNK_A, PP_COMPONENTS, 'ts', HISTORY_SEGMENT, YAML) }}
+{{ "native" | form_remap_dep('temporal', PP_CHUNK_A, PP_COMPONENTS, 'ts', YAML, HISTORY_SEGMENT) }}
     {% if DO_TIMEAVGS %}
-{{ "native" | form_remap_dep('temporal', PP_CHUNK_A, PP_COMPONENTS, 'av', HISTORY_SEGMENT, YAML) }}
+{{ "native" | form_remap_dep('temporal', PP_CHUNK_A, PP_COMPONENTS, 'av', YAML, HISTORY_SEGMENT) }}
     {% endif %}
 {% endif %}