Merge pull request #11 from geoglows/adapt_to_ecmwf2

Adapt to ecmwf2

README.md

@@ -67,6 +67,7 @@ ecflow_entities:
         - PYSCRIPT
         - WORKSPACE
         - VPU
+        - OUTPUT_DIR
       suite: geoglows_forecast
     - name: rapid_forecast_task
       variables:
@@ -99,6 +100,9 @@ rapid_exec: /path/to/rapid_exec
 rapid_exec_dir: /path/to/rapid_exec_dir
 rapid_subprocess_dir: /path/to/rapid_subprocess_dir
 
+# forecast records variables
+forecast_records_dir: /path/to/forecast_records_dir
+
 # nco variables
 nces_exec: /path/to/nces_exec
 

geoglows_ecflow/geoglows_forecast_job.py

@@ -194,6 +194,7 @@ def create_day_one_family(
     family_name: str,
     task_name: str,
     vpu_list: list[str],
+    output_dir: str,
     trigger: str,
     is_local: bool = False,
 ) -> Family:
@@ -203,7 +204,7 @@ def create_day_one_family(
         family_name (str): Name of the family group.
         task_name (str): Name of the task.
         vpu_list (list[str]): List of VPU codes.
-        nces_exec (str): Path to the nces executable.
+        output_dir (str): Path to forecast records output directory.
         trigger (str): Trigger that will start this family.
         is_local (bool, optional): True if the job is run locally.
 
@@ -222,6 +223,7 @@ def create_day_one_family(
         # Create init flows tasks
         task = Task(f"{task_name}_{vpu}")
         task.add_variable("VPU", str(vpu))
+        task.add_variable("OUTPUT_DIR", output_dir)
         if is_local:
             if i > 0:
                 prev_vpu = vpu_list[i - 1]
@@ -311,6 +313,7 @@ def create(config_path: str) -> None:
     rapid_exec = config["rapid_exec"]
     rapid_exec_dir = config["rapid_exec_dir"]
     rapid_subprocess_dir = config["rapid_subprocess_dir"]
+    forecast_records_dir = config["forecast_records_dir"]
     nces_exec = config["nces_exec"]
     aws_config = config["aws_config"]
 
@@ -410,6 +413,7 @@ def create(config_path: str) -> None:
         day_one_family_name,
         day_one_task_name,
         vpu_list,
+        forecast_records_dir,
         init_flows_family_name,
         is_local=local_run,
     )

geoglows_ecflow/resources/day_one_forecast.py

@@ -312,14 +312,19 @@ def update_forecast_records(
         nargs=1,
         help="VPU number",
     )
+    parser.add_argument(
+        "output_dir",
+        nargs=1,
+        help="path to the forecast records output directory",
+    )
 
     args = parser.parse_args()
     workspace = args.workspace[0]
     vpu = args.vpu[0]
     rapid_input = os.path.join(workspace, "input")
     rapid_output = os.path.join(workspace, "output")
     returnperiods = os.path.join(workspace, "return_periods_dir")
-    forecast_records = os.path.join(workspace, "forecast_records")
+    forecast_records = args.output_dir[0]
     rapid_output = os.path.join(workspace, "output")
 
     # start logging