Merge pull request #43 from NOAA-GFDL/42.fix-bugs

42.fix/update-workflow-bugs
NOAA-GFDL · Jan 17, 2025 · 4a75ccc · 4a75ccc
2 parents 0a9837a + 0174214
commit 4a75ccc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/site/gaea.cylc b/site/gaea.cylc
@@ -24,7 +24,7 @@
             COPY_TOOL=gcp
 
     [[STAGE-HISTORY]]
-        pre-script = module load gcp hsm/test
+        pre-script = module load gcp hsm/1.3.0
 
 {% if DO_REFINEDIAG or DO_PREANALYSIS %}
     [[PRE-ANALYSIS]]
@@ -94,7 +94,7 @@
         pre-script = """
             module use -a /usw/conda/modulefiles
             module load fre-nctools/2023.01.02 nco miniforge
-            conda activate /ncrc/home2/fms/conda/envs/fre-cli
+            conda activate /ncrc/home2/fms/conda/envs/fre-2025.01
             mkdir -p $outputDir
         """
         [[[environment]]]

diff --git a/site/ppan.cylc b/site/ppan.cylc
@@ -23,7 +23,7 @@
             COPY_TOOL=gcp
 
     [[STAGE-HISTORY]]
-        pre-script = module load gcp/2.3 hsm/test
+        pre-script = module load gcp/2.3 hsm/1.3.0
 
 {% if DO_REFINEDIAG or DO_PREANALYSIS %}
     [[PRE-ANALYSIS]]
@@ -80,7 +80,7 @@
         pre-script = """
             module load fre-nctools miniforge
             set +u
-            conda activate /nbhome/fms/conda/envs/fre-cli
+            conda activate /nbhome/fms/conda/envs/fre-2025.01
             set -u
             module load gcp
             mkdir -p $outputDir
@@ -106,14 +106,14 @@
         pre-script = """
             module load fre-nctools miniforge
             set +u
-            conda activate /nbhome/fms/conda/envs/fre-cli
+            conda activate /nbhome/fms/conda/envs/fre-2025.01
             set -u
             mkdir -p $outputDir
         """
 {% endif %}
 
     [[MASK-ATMOS-PLEVEL]]
-        pre-script = module load python/3.9
+        pre-script = module load python/3.10
 
     [[CLEAN]]
         pre-script = "set -x"

diff --git a/site/ppan_test.cylc b/site/ppan_test.cylc
@@ -51,7 +51,7 @@
             epmt annotate EPMT_JOB_TAGS="exp_name:{{ EXPERIMENT }};exp_fre_mod:canopy;exp_platform:{{ PLATFORM }};exp_target:{{ TARGET }};exp_component:stage-history;exp_component_source:PLACE_HOLDER;exp_time:$CYLC_TASK_CYCLE_POINT;exp_seg_months:{{ HISTORY_SEGMENT }};pp_chunk_a_months:{{ MOS_PER_CHUNK_A }};pp_chunk_b_months:{{ MOS_PER_CHUNK_B }};script_name:$CYLC_TASK_NAME;exp_run_uuid:$CYLC_WORKFLOW_UUID"
             {{ EPMT_POSTAMBLE }}
         """
-        pre-script = module load gcp/2.3 hsm/test
+        pre-script = module load gcp/2.3 hsm/1.3.0
 
 {% if DO_REFINEDIAG or DO_PREANALYSIS %}
     [[PRE-ANALYSIS]]
@@ -118,7 +118,7 @@
         pre-script = """
             module load fre-nctools miniforge
             set +u
-            conda activate /nbhome/fms/conda/envs/fre-cli
+            conda activate /nbhome/fms/conda/envs/fre-2025.01
             set -u
             module load gcp
             mkdir -p $outputDir
@@ -149,14 +149,14 @@
         pre-script = """
             module load fre-nctools miniforge
             set +u
-            conda activate /nbhome/fms/conda/envs/fre-cli
+            conda activate /nbhome/fms/conda/envs/fre-2025.01
             set -u
             mkdir -p $outputDir
         """
 {% endif %}
 
     [[MASK-ATMOS-PLEVEL]]
-        pre-script = module load python/3.9
+        pre-script = module load python/3.10
 
     [[CLEAN]]
         env-script = """