Issue NOAA-EMC#85: (1) rename "chgresfcst" as "echgres", (2) add chgr…

…es variables to env
lgannoaa · Jun 16, 2020 · 71d7141 · 71d7141
1 parent 15d5bed
commit 71d7141
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 33 deletions.
diff --git a/env/HERA.env b/env/HERA.env
@@ -67,9 +67,12 @@ elif [ $step = "anal" ]; then
 
     export NTHREADS_GAUSFCANL=1
     npe_gausfcanl=${npe_gausfcanl:-1}
-
     export APRUN_GAUSFCANL="$launcher -n $npe_gausfcanl"
 
+    export NTHREADS_CHGRES=${nth_echgres:-1}
+    [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
+    export APRUN_CHGRES=""
+
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="$launcher"
 

diff --git a/env/JET.env b/env/JET.env
@@ -58,6 +58,10 @@ elif [ $step = "anal" ]; then
     npe_gausfcanl=${npe_gausfcanl:-1}
     export APRUN_GAUSFCANL="$launcher $npe_gausfcanl"
 
+    export NTHREADS_CHGRES=${nth_echgres:-1}
+    [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
+    export APRUN_CHGRES=""
+
 elif [ $step = "gldas" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_gldas))

diff --git a/env/WCOSS_C.env b/env/WCOSS_C.env
@@ -66,6 +66,10 @@ elif [ $step = "anal" ]; then
     [[ $npe_node_gausfcanl -gt $npe_gausfcanl ]] && npe_node_gausfcanl=$npe_gausfcanl
     export APRUN_GAUSFCANL="$launcher -j 1 -n $npe_gausfcanl -N $npe_node_gausfcanl -d $NTHREADS_GAUSFCANL -cc depth"
 
+    export NTHREADS_CHGRES=${nth_echgres:-1}
+    [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
+    export APRUN_CHGRES="$launcher -j 1 -n 1 -N 1 -d $NTHREADS_CHGRES -cc depth"
+
 elif [ $step = "gldas" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_gldas))

diff --git a/env/WCOSS_DELL_P3.env b/env/WCOSS_DELL_P3.env
@@ -66,7 +66,7 @@ elif [ $step = "anal" ]; then
     npe_gausfcanl=${npe_gausfcanl:-1}
     export APRUN_GAUSFCANL="$launcher $npe_gausfcanl"
 
-    export NTHREADS_CHGRES=${nth_chgresfcst:-14}
+    export NTHREADS_CHGRES=${nth_echgres:-14}
     [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
     export APRUN_CHGRES=""
 

diff --git a/jobs/rocoto/chgresfcst.sh → jobs/rocoto/echgres.sh b/jobs/rocoto/chgresfcst.sh → jobs/rocoto/echgres.sh
@@ -8,6 +8,6 @@ status=$?
 
 ###############################################################
 # Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_CHGRESFCST
+$HOMEgfs/jobs/JGDAS_ENKF_CHGRES
 status=$?
 exit $status
diff --git a/parm/config/config.chgresfcst b/parm/config/config.chgresfcst
diff --git a/parm/config/config.echgres b/parm/config/config.echgres
@@ -0,0 +1,13 @@
+#!/bin/ksh -x
+
+########## config.echgres ##########
+# regrid full-res forecast for use in ensemble-res analysis generation
+
+echo "BEGIN: config.echgres"
+
+# Get task specific resources
+. $EXPDIR/config.resources echgres
+
+export CHGRESFCSTSH=$HOMEgfs/scripts/exglobal_enkf_chgres_fv3gfs.sh.ecf
+
+echo "END: config.echgres"
diff --git a/parm/config/config.resources b/parm/config/config.resources
@@ -8,7 +8,7 @@ if [ $# -ne 1 ]; then
 
     echo "Must specify an input task argument to set resource variables!"
     echo "argument can be any one of the following:"
-    echo "anal analcalc analdiag gldas fcst post vrfy metp arch chgresfcst"
+    echo "anal analcalc analdiag gldas fcst post vrfy metp arch echgres"
     echo "eobs ediag eomg eupd ecen esfc efcs epos earc"
     echo "waveinit waveprep wavepostsbs wavegempaksbs waveawipssbs"
     echo "wavepost waveawips wavestat"
@@ -200,13 +200,13 @@ elif [ $step = "metp" ]; then
             export memory_metp="16384M"
     fi
 
-elif [ $step = "chgresfcst" ]; then
+elif [ $step = "echgres" ]; then
 
-    export wtime_chgresfcst="01:00:00"
-    export npe_chgresfcst=3
-    export nth_chgresfcst=1
-    export npe_node_chgresfcst=1
-    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_chgresfcst=28 ; fi
+    export wtime_echgres="01:00:00"
+    export npe_echgres=3
+    export nth_echgres=1
+    export npe_node_echgres=1
+    if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_echgres=28 ; fi
 
 elif [ $step = "arch" -o $step = "earc" -o $step = "getic" ]; then
 

diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
@@ -106,7 +106,6 @@ cd ${pwd}/../jobs               ||exit 8
     $LINK ../sorc/gsi.fd/jobs/JGLOBAL_ANALYSIS           .
     $LINK ../sorc/gsi.fd/jobs/JGLOBAL_ANALCALC           .
     $LINK ../sorc/gsi.fd/jobs/JGLOBAL_ANALDIAG           .
-    $LINK ../sorc/gsi.fd/jobs/JGLOBAL_CHGRESFCST         .
     $LINK ../sorc/gsi.fd/jobs/JGLOBAL_ENKF_SELECT_OBS    .
     $LINK ../sorc/gsi.fd/jobs/JGLOBAL_ENKF_ANALDIAG      .
     $LINK ../sorc/gsi.fd/jobs/JGLOBAL_ENKF_INNOVATE_OBS  .
@@ -115,18 +114,19 @@ cd ${pwd}/../jobs               ||exit 8
     $LINK ../sorc/gsi.fd/jobs/JGDAS_ENKF_SURFACE         .    
     $LINK ../sorc/gsi.fd/jobs/JGDAS_ENKF_FCST            .
     $LINK ../sorc/gsi.fd/jobs/JGDAS_ENKF_POST            .
+    $LINK ../sorc/gsi.fd/jobs/JGDAS_ENKF_CHGRES          .
 cd ${pwd}/../scripts            ||exit 8
     $LINK ../sorc/gsi.fd/scripts/exglobal_analysis_fv3gfs.sh.ecf           .
     $LINK ../sorc/gsi.fd/scripts/exglobal_analcalc_fv3gfs.sh.ecf           .
     $LINK ../sorc/gsi.fd/scripts/exglobal_analdiag_fv3gfs.sh.ecf           .
-    $LINK ../sorc/gsi.fd/scripts/exglobal_chgresfcst_fv3gfs.sh.ecf         .
     $LINK ../sorc/gsi.fd/scripts/exglobal_innovate_obs_fv3gfs.sh.ecf       .
     $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_innovate_obs_fv3gfs.sh.ecf  .
     $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_update_fv3gfs.sh.ecf        .
     $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_recenter_fv3gfs.sh.ecf      .
     $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_surface_fv3gfs.sh.ecf       .
     $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_fcst_fv3gfs.sh.ecf          .
     $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_post_fv3gfs.sh.ecf          .
+    $LINK ../sorc/gsi.fd/scripts/exglobal_enkf_chgres_fv3gfs.sh.ecf        .
 cd ${pwd}/../fix                ||exit 8
     [[ -d fix_gsi ]] && rm -rf fix_gsi
     $LINK ../sorc/gsi.fd/fix  fix_gsi

diff --git a/ush/rocoto/setup_workflow.py b/ush/rocoto/setup_workflow.py
@@ -54,7 +54,7 @@ def main():
     #wav_steps_awips = ['waveawipssbs', 'waveawips']
 # From gfsv16b latest
 #    gfs_steps = ['prep', 'anal', 'gldas', 'fcst', 'postsnd', 'post', 'awips', 'gempak', 'vrfy', 'metp', 'arch']
-    hyb_steps = ['eobs', 'ediag', 'eomg', 'eupd', 'ecen', 'esfc', 'efcs', 'chgresfcst', 'epos', 'earc']
+    hyb_steps = ['eobs', 'ediag', 'eomg', 'eupd', 'ecen', 'esfc', 'efcs', 'echgres', 'epos', 'earc']
 
     steps = gfs_steps + hyb_steps if _base.get('DOHYBVAR', 'NO') == 'YES' else gfs_steps
     steps = steps + metp_steps if _base.get('DO_METP', 'NO') == 'YES' else steps
@@ -308,9 +308,9 @@ def get_hyb_resources(dict_configs):
 
     # These tasks can be run in either or both cycles
     if lobsdiag_forenkf in ['.T.', '.TRUE.']:
-        tasks1 = ['eobs', 'ediag', 'eupd', 'chgresfcst']
+        tasks1 = ['eobs', 'ediag', 'eupd', 'echgres']
     else:
-        tasks1 = ['eobs', 'eomg', 'eupd', 'chgresfcst']
+        tasks1 = ['eobs', 'eomg', 'eupd', 'echgres']
 
     if eupd_cyc in ['BOTH']:
         cdumps = ['gfs', 'gdas']
@@ -474,7 +474,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     dep_dict = {'type': 'task', 'name': '%sanal' % cdump}
     deps.append(rocoto.add_dependency(dep_dict))
     if dohybvar in ['y', 'Y', 'yes', 'YES'] and cdump == 'gdas':
-        dep_dict = {'type': 'task', 'name': '%schgresfcst' % 'gdas', 'offset': '-06:00:00'}
+        dep_dict = {'type': 'task', 'name': '%sechgres' % 'gdas', 'offset': '-06:00:00'}
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
     else:
@@ -880,16 +880,16 @@ def get_hyb_tasks(dict_configs, cycledef='enkf'):
 
     dict_tasks['%sefmn' % cdump] = task
 
-    # chgresfcst
+    # echgres
     deps1 = []
     dep_dict = {'type': 'task', 'name': '%sfcst' % cdump}
     deps1.append(rocoto.add_dependency(dep_dict))
     dep_dict = {'type': 'metatask', 'name': '%sefmn' % cdump}
     deps1.append(rocoto.add_dependency(dep_dict))
     dependencies1 = rocoto.create_dependency(dep_condition='and', dep=deps1)
-    task = wfu.create_wf_task('chgresfcst', cdump=cdump, envar=envars1, dependency=dependencies1, cycledef=cycledef)
+    task = wfu.create_wf_task('echgres', cdump=cdump, envar=envars1, dependency=dependencies1, cycledef=cycledef)
 
-    dict_tasks['%schgresfcst' % cdump] = task
+    dict_tasks['%sechgres' % cdump] = task
 
     # epmn, epos
     deps = []
@@ -1122,7 +1122,7 @@ def create_xml(dict_configs):
                      'gdasefcs':'gdasefmn',
                      'gdasepos':'gdasepmn',
                      'gdasearc':'gdaseamn',
-                     'gdaschgresfcst':'gdaschgresfcst'}
+                     'gdasechgres':'gdasechgres'}
         for each_task, each_resource_string in dict_hyb_resources.iteritems():
             #print each_task,hyp_tasks[each_task]
             #print dict_hyb_tasks[hyp_tasks[each_task]]