Merge pull request #605 from KateFriedman-NOAA/feature/ops-wcoss2_fixes

Series of small WCOSS2 updates - round 8
NOAA-EMC · Jan 25, 2022 · ee2c417 · ee2c417
2 parents 415ec5d + 5115509
commit ee2c417
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -32,7 +32,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
 
 elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll"  -o $step = "wavepostpnt" ]; then
 
-    if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
+    if [ $step = "waveprep" -a $CDUMP = "gfs" ]; then NTASKS=$NTASKS_gfs ; fi
     export wavempexec="$launcher -np"
     export wave_mpmd=${mpmd}
 

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -63,8 +63,6 @@ export EXECwave=${EXECwave:-$HOMEgfs/exec}
 export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 
-export COMINice=${COMINice:-${COMROOTp2}/omb/prod}
-export COMINwnd=${COMINwnd:-$(compath.py ${envir}/gfs/${gfs_ver})}
 export COMIN_WAV_CUR=${COMIN_WAV_CUR:-$(compath.py ${envir}/rtofs/${rtofs_ver})}
 
 mkdir -p $COMOUT/gridded

diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
@@ -118,6 +118,8 @@ export COMINatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos
 export COMOUTatmos=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos
 export COMINwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
 export COMOUTwave=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/wave
+export COMIN_OBS=${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos
+export COMIN_GES_OBS=${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos
 
 export ERRSCRIPT=${ERRSCRIPT:-'eval [[ $err = 0 ]]'}
 export LOGSCRIPT=${LOGSCRIPT:-""}

diff --git a/ush/rocoto/setup_workflow.py b/ush/rocoto/setup_workflow.py
@@ -397,6 +397,10 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     envars.append(rocoto.create_envar(name='CDUMP', value=f'{cdump}'))
     envars.append(rocoto.create_envar(name='PDY', value='<cyclestr>@Y@m@d</cyclestr>'))
     envars.append(rocoto.create_envar(name='cyc', value='<cyclestr>@H</cyclestr>'))
+    envars.append(rocoto.create_envar(name='GDATE', value='<cyclestr offset="-6:00:00">@Y@m@d@H</cyclestr>'))
+    envars.append(rocoto.create_envar(name='GDUMP', value='gdas'))
+    envars.append(rocoto.create_envar(name='gPDY', value='<cyclestr offset="-6:00:00">@Y@m@d</cyclestr>'))
+    envars.append(rocoto.create_envar(name='gcyc', value='<cyclestr offset="-6:00:00">@H</cyclestr>'))
 
     base = dict_configs['base']
     gfs_cyc = base.get('gfs_cyc', 0)

diff --git a/ush/rocoto/setup_workflow_fcstonly.py b/ush/rocoto/setup_workflow_fcstonly.py
@@ -239,6 +239,10 @@ def get_workflow(dict_configs, cdump='gdas'):
     envars.append(rocoto.create_envar(name='CDUMP', value='&CDUMP;'))
     envars.append(rocoto.create_envar(name='PDY', value='<cyclestr>@Y@m@d</cyclestr>'))
     envars.append(rocoto.create_envar(name='cyc', value='<cyclestr>@H</cyclestr>'))
+    envars.append(rocoto.create_envar(name='GDATE', value='<cyclestr offset="-6:00:00">@Y@m@d@H</cyclestr>'))
+    envars.append(rocoto.create_envar(name='GDUMP', value='gdas'))
+    envars.append(rocoto.create_envar(name='gPDY', value='<cyclestr offset="-6:00:00">@Y@m@d</cyclestr>'))
+    envars.append(rocoto.create_envar(name='gcyc', value='<cyclestr offset="-6:00:00">@H</cyclestr>'))
 
     base = dict_configs['base']
     machine = base.get('machine', wfu.detectMachine())
@@ -673,6 +677,40 @@ def get_workflow(dict_configs, cdump='gdas'):
     return ''.join(tasks)
 
 
+def get_awipsgroups(awips, cdump='gfs'):
+
+    fhmin = awips['FHMIN']
+    fhmax = awips['FHMAX']
+    fhout = awips['FHOUT']
+
+    # Get a list of all forecast hours
+    if cdump in ['gdas']:
+        fhrs = range(fhmin, fhmax+fhout, fhout)
+    elif cdump in ['gfs']:
+        fhmax = np.max([awips['FHMAX_GFS_00'],awips['FHMAX_GFS_06'],awips['FHMAX_GFS_12'],awips['FHMAX_GFS_18']])
+        fhout = awips['FHOUT_GFS']
+        fhmax_hf = awips['FHMAX_HF_GFS']
+        fhout_hf = awips['FHOUT_HF_GFS']
+        if fhmax > 240:
+            fhmax = 240
+        if fhmax_hf > 240:
+            fhmax_hf = 240
+        fhrs_hf = range(fhmin, fhmax_hf+fhout_hf, fhout_hf)
+        fhrs = list(fhrs_hf) + list(range(fhrs_hf[-1]+fhout, fhmax+fhout, fhout))
+
+    nawipsgrp = awips['NAWIPSGRP']
+    ngrps = nawipsgrp if len(fhrs) > nawipsgrp else len(fhrs)
+
+    fhrs = [f'f{f:03d}' for f in fhrs]
+    fhrs = np.array_split(fhrs, ngrps)
+    fhrs = [f.tolist() for f in fhrs]
+
+    fhrgrp = ' '.join([f'{x:03d}' for x in range(0, ngrps)])
+    fhrdep = ' '.join([f[-1] for f in fhrs])
+    fhrlst = ' '.join(['_'.join(f) for f in fhrs])
+
+    return fhrgrp, fhrdep, fhrlst
+
 def get_workflow_body(dict_configs, cdump='gdas'):
     '''
         Create the workflow body

diff --git a/ush/rocoto/workflow_utils.py b/ush/rocoto/workflow_utils.py
@@ -287,7 +287,10 @@ def get_resources(machine, cfg, task, reservation, cdump='gdas'):
 
     ltask = 'eobs' if task in ['eomg'] else task
 
-    memory = cfg.get(f'memory_{ltask}', None)
+    if cdump in ['gfs'] and f'memory_{task}_gfs' in cfg.keys():
+        memory = cfg.get(f'memory_{ltask}_gfs', None)
+    else:
+        memory = cfg.get(f'memory_{ltask}', None)
 
     if cdump in ['gfs'] and f'npe_{task}_gfs' in cfg.keys():
         tasks = cfg[f'npe_{ltask}_gfs']