update to account for new HYCOM-forced CROCO setup

SAEON · Nov 6, 2024 · d9d61de · d9d61de
1 parent 36e6c9b
commit d9d61de
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 12 deletions.
diff --git a/.github/workflows/run_ops.yml b/.github/workflows/run_ops.yml
@@ -116,6 +116,38 @@ jobs:
       EXTENTS: ${{ github.event.inputs.extents }}
       DX_M: ${{ github.event.inputs.dx_m }}
 
+  run_GFS_HYCOM:
+    needs: [envs,build_image]
+    uses: ./.github/workflows/run_model.yml  # Path to your reusable workflow
+    with:
+      MODEL_TYPE: ${{ github.event.inputs.model_type }}
+      BRANCH_REF: ${{ needs.envs.outputs.BRANCH_REF }}
+      CONFIG_NAME: ${{ needs.envs.outputs.CONFIG_NAME }}
+      RUN_DATE: ${{ needs.envs.outputs.RUN_DATE }}
+      RUNNER_NAME: mims1
+      WIND: GFS
+      OGCM: HYCOM
+      RUN_MODEL: ${{ github.event.inputs.run_model }}
+      DO_POST: ${{ github.event.inputs.do_post }}
+      EXTENTS: ${{ github.event.inputs.extents }}
+      DX_M: ${{ github.event.inputs.dx_m }}
+
+  run_SAWS_HYCOM:
+    needs: [envs,build_image]
+    uses: ./.github/workflows/run_model.yml  # Path to your reusable workflow
+    with:
+      MODEL_TYPE: ${{ github.event.inputs.model_type }}
+      BRANCH_REF: ${{ needs.envs.outputs.BRANCH_REF }}
+      CONFIG_NAME: ${{ needs.envs.outputs.CONFIG_NAME }}
+      RUN_DATE: ${{ needs.envs.outputs.RUN_DATE }}
+      RUNNER_NAME: mims1
+      WIND: SAWS
+      OGCM: HYCOM
+      RUN_MODEL: ${{ github.event.inputs.run_model }}
+      DO_POST: ${{ github.event.inputs.do_post }}
+      EXTENTS: ${{ github.event.inputs.extents }}
+      DX_M: ${{ github.event.inputs.dx_m }}
+
   # get some combined output from runs with different forcings
   # maybe we need a check to see if more than 1 run was actually successful?
   combine_output:

diff --git a/configs/config_leeway.py b/configs/config_leeway.py
@@ -15,7 +15,7 @@
 config_name='test_leeway'
 #
 # define the date when the croco runs were initialised, in format YYYYMMDD_HH 
-run_date='20241027_00'
+run_date='20241106_12'
 
 # ------------
 # object info
@@ -37,7 +37,7 @@
 object_type=26
 
 # start time of spill, in format YYYYMMDD_HH, in UTC
-release_start_time='20241027_12'
+release_start_time='20241102_00'
 
 # -------------
 # forcing files
@@ -55,8 +55,8 @@
 # this is an array of file names to allow for the inclusion of multiple croco runs
 # The order is important - preference will be given to those which appear first in the array
 # The default locations are those inside the docker image used to run operationally 
-croco_files = ['/mnt/tmp/sa_southeast_01/croco_v1.3.1/C03_I99_OGCM_WIND/output/croco_avg.nc',
-        '/mnt/tmp/sa_west_02/croco_v1.3.1/C03_I99_OGCM_WIND/output/croco_avg.nc'
+croco_files = ['/mnt/tmp/sa_southeast_01/croco_v1.3.1/C04_I99_OGCM_WIND/output/croco_avg.nc',
+        '/mnt/tmp/sa_west_02/croco_v1.3.1/C04_I99_OGCM_WIND/output/croco_avg.nc'
         ]
 
 # ogcm file, as downloaded using the somisana pre-processing tools

diff --git a/configs/config_oceandrift.py b/configs/config_oceandrift.py
@@ -15,7 +15,7 @@
 config_name='test_oceandrift'
 #
 # define the date when the croco runs were initialised, in format YYYYMMDD_HH 
-run_date='20241031_00'
+run_date='20241106_12'
 
 # -------------
 # release info
@@ -35,7 +35,7 @@
 radius=3000
 #
 # start time of release, in format YYYYMMDD_HH, in UTC
-release_start_time='20241031_12'
+release_start_time='20241102_00'
 #
 # duration of the release of particles in hours
 release_dur=0
@@ -56,8 +56,8 @@
 # this is an array of file names to allow for the inclusion of multiple croco runs
 # The order is important - preference will be given to those which appear first in the array
 # The default locations are those inside the docker image used to run operationally 
-croco_files = ['/mnt/tmp/sa_southeast_01/croco_v1.3.1/C03_I99_OGCM_WIND/output/croco_avg.nc',
-        '/mnt/tmp/sa_west_02/croco_v1.3.1/C03_I99_OGCM_WIND/output/croco_avg.nc'
+croco_files = ['/mnt/tmp/sa_southeast_01/croco_v1.3.1/C04_I99_OGCM_WIND/output/croco_avg.nc',
+        '/mnt/tmp/sa_west_02/croco_v1.3.1/C04_I99_OGCM_WIND/output/croco_avg.nc'
         ]
 
 # ogcm file, as downloaded using the somisana pre-processing tools

diff --git a/configs/config_oil.py b/configs/config_oil.py
@@ -15,7 +15,7 @@
 config_name='test_oil'
 #
 # define the date when the croco runs were initialised, in format YYYYMMDD_HH 
-run_date='20241027_00'
+run_date='20241106_12'
 
 # -----------
 # spill info
@@ -42,7 +42,7 @@
 oil_type='GENERIC INTERMEDIATE FUEL OIL 180'
 #
 # start time of spill, in format YYYYMMDD_HH, in UTC
-release_start_time='20241027_12'
+release_start_time='20241102_00'
 #
 # duration of the release of oil in hours (this can't be zero!)
 release_dur=1
@@ -82,8 +82,8 @@
 # this is an array of file names to allow for the inclusion of multiple croco runs
 # The order is important - preference will be given to those which appear first in the array
 # The default locations are those inside the docker image used to run operationally 
-croco_files = ['/mnt/tmp/sa_southeast_01/croco_v1.3.1/C03_I99_OGCM_WIND/output/croco_avg.nc',
-        '/mnt/tmp/sa_west_02/croco_v1.3.1/C03_I99_OGCM_WIND/output/croco_avg.nc'
+croco_files = ['/mnt/tmp/sa_southeast_01/croco_v1.3.1/C04_I99_OGCM_WIND/output/croco_avg.nc',
+        '/mnt/tmp/sa_west_02/croco_v1.3.1/C04_I99_OGCM_WIND/output/croco_avg.nc'
         ]
 
 # ogcm file, as downloaded using the somisana pre-processing tools