changes to enkf only to allow jedi enkf only to run

TravisElless-NOAA · Dec 10, 2024 · 86f49a7 · 86f49a7
1 parent 766b97c
commit 86f49a7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE
@@ -19,8 +19,8 @@ GDUMP="gdas"
 # Generate COM variables from templates
 RUN=${GDUMP} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS
 
-RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
-    COM_ATMOS_ANALYSIS_PREV:COM_ATMOS_ANALYSIS_TMPL
+RUN="enkfgdas" YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
+    COM_ATMOS_ANALYSIS_PREV:COM_ENS_ATMOS_ANALYSIS_TMPL
 
 ###############################################################
 # Run relevant script

diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -1097,7 +1097,7 @@ case ${step} in
     export layout_x=${layout_x_atmensanl}
     export layout_y=${layout_y_atmensanl}
 
-    walltime="00:30:00"
+    walltime="01:30:00"
     ntasks=$(( layout_x * layout_y * 6 ))
     threads_per_task=1
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))

diff --git a/parm/config/gfs/config.resources.HERA b/parm/config/gfs/config.resources.HERA
@@ -27,7 +27,7 @@ case ${step} in
     ;;
 
   "atmensanlsol")
-    export tasks_per_node=12
+    export tasks_per_node=8
     ;;
 
   "eupd")

diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py
@@ -290,17 +290,24 @@ def get_task_names(self):
         gfs_tasks += gdas_gfs_common_cleanup_tasks
 
         tasks = dict()
-        gdas_tasks.remove("anal")
+        if self.do_jediatmvar:
+            gdas_tasks.remove("atmanlinit")
+            gdas_tasks.remove("atmanlvar")
+            gdas_tasks.remove("atmanlfv3inc")
+            gdas_tasks.remove("atmanlfinal")
+        else:
+            gdas_tasks.remove("anal")
+            gdas_tasks.remove("analdiag")
         gdas_tasks.remove("sfcanl")
         gdas_tasks.remove("analcalc")
-        gdas_tasks.remove("analdiag")
         gdas_tasks.remove("fcst")
         gdas_tasks.remove("atmanlprod")
         gdas_tasks.remove("stage_ic")
         gdas_tasks.remove("arch")
         gdas_tasks.remove("atmos_prod")
         gdas_tasks.remove("atmanlupp")
         gdas_tasks.remove("cleanup")
+
         tasks['gdas'] = gdas_tasks
 
         if self.do_hybvar and 'gdas' in self.eupd_runs:
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ case ${step} in @@
         ;;
       "atmensanlsol")
-        export tasks_per_node=12
+        export tasks_per_node=8
         ;;
       "eupd")
@@ Expand Down @@