Skip to content

Commit 0ae1027

Browse files
committed
concising the exgfs_wave_post_pnt.sh and config files, issue NOAA-EMC#3157
1 parent e79e739 commit 0ae1027

File tree

3 files changed

+11
-30
lines changed

3 files changed

+11
-30
lines changed

parm/config/config.resources.emc.dyn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@ elif [ $step = "wavepostbndpnt" ]; then
9393
export wtime_wavepostbndpnt="00:30:00"
9494
export npe_wavepostbndpnt=1
9595
export nth_wavepostbndpnt=1
96-
export npe_node_wavepostbndpnt=1
96+
export npe_node_wavepostbndpnt=${npe_wavepostbndpnt}
9797
export NTASKS=$npe_wavepostbndpnt
9898

9999
elif [ $step = "wavepostbndpntbll" ]; then
100100

101101
export wtime_wavepostbndpntbll="00:10:00"
102102
export npe_wavepostbndpntbll=2
103103
export nth_wavepostbndpntbll=1
104-
export npe_node_wavepostbndpntbll=2
104+
export npe_node_wavepostbndpntbll=${npe_wavepostbndpntbll}
105105
export NTASKS=$npe_wavepostbndpntbll
106106

107107
elif [ $step = "wavepostpnt" ]; then
108108

109109
export wtime_wavepostpnt="00:35:00"
110110
export npe_wavepostpnt=3
111111
export nth_wavepostpnt=1
112-
export npe_node_wavepostpnt=3
112+
export npe_node_wavepostpnt=${npe_wavepostpnt}
113113
export NTASKS=$npe_wavepostpnt
114114

115115
elif [ $step = "wavegempak" ]; then

parm/config/config.resources.nco.static

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ elif [ $step = "wavepostbndpnt" ]; then
7777
export wtime_wavepostbndpnt="00:30:00"
7878
export npe_wavepostbndpnt=1
7979
export nth_wavepostbndpnt=1
80-
export npe_node_wavepostbndpnt=1
80+
export npe_node_wavepostbndpnt=${npe_wavepostbndpnt}
8181
export NTASKS=$npe_wavepostbndpnt
8282

8383
elif [ $step = "wavepostbndpntbll" ]; then
8484

8585
export wtime_wavepostbndpntbll="00:10:00"
8686
export npe_wavepostbndpntbll=2
8787
export nth_wavepostbndpntbll=1
88-
export npe_node_wavepostbndpntbll=2
88+
export npe_node_wavepostbndpntbll=${npe_wavepostbndpntbll}
8989
export NTASKS=$npe_wavepostbndpntbll
9090

9191
elif [ $step = "wavepostpnt" ]; then
9292

9393
export wtime_wavepostpnt="00:35:00"
9494
export npe_wavepostpnt=3
9595
export nth_wavepostpnt=1
96-
export npe_node_wavepostpnt=3
96+
export npe_node_wavepostpnt=${npe_wavepostpnt}
9797
export NTASKS=$npe_wavepostpnt
9898

9999
elif [ $step = "wavegempak" ]; then

scripts/exgfs_wave_post_pnt.sh

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -364,18 +364,20 @@
364364
fhr=$fhrp # no gridded output, loop with out_pnt stride
365365
done
366366

367-
if [ "$DOSPC_WAV" = 'YES' ] && [ "$DOBLL_WAV" = "NO" ]; then
367+
if [ "$DOSPC_WAV" = 'YES' ]; then
368368
sed -e "s/TIME/$tstart/g" \
369369
-e "s/DT/$dtspec/g" \
370370
-e "s/999/$N/g" \
371371
-e "s|POINT|$points|g" \
372372
-e "s/ITYPE/1/g" \
373373
-e "s/FORMAT/F/g" \
374374
ww3_outp_spec.inp.tmpl > ww3_outp.inp
375-
375+
376376
$EXECwave/ww3_outp ${WAV_MOD_TAG} 1> ww3_outp_spec.log 2>&1
377377

378-
elif [ "$DOSPC_WAV" = 'NO' ] && [ "$DOBLL_WAV" = "YES" ]; then
378+
fi
379+
380+
if [ "$DOBLL_WAV" = "YES" ]; then
379381
sed -e "s/TIME/$tstart/g" \
380382
-e "s/DT/$dtspec/g" \
381383
-e "s/999/$N/g" \
@@ -384,27 +386,6 @@
384386
ww3_outp_bull.inp.tmpl > ww3_outp.inp
385387

386388
$EXECwave/ww3_outp ${WAV_MOD_TAG} 1> ww3_outp_bull.log 2>&1
387-
388-
elif [[ "$DOSPC_WAV" == "YES" && "$DOBLL_WAV" == "YES" ]]; then
389-
sed -e "s/TIME/$tstart/g" \
390-
-e "s/DT/$dtspec/g" \
391-
-e "s/999/$N/g" \
392-
-e "s|POINT|$points|g" \
393-
-e "s/ITYPE/1/g" \
394-
-e "s/FORMAT/F/g" \
395-
ww3_outp_spec.inp.tmpl > ww3_outp.inp
396-
397-
$EXECwave/ww3_outp ${WAV_MOD_TAG} 1> ww3_outp_spec.log 2>&1
398-
399-
sed -e "s/TIME/$tstart/g" \
400-
-e "s/DT/$dtspec/g" \
401-
-e "s/999/$N/g" \
402-
-e "s|POINT|$points|g" \
403-
-e "s/REFT/$truntime/g" \
404-
ww3_outp_bull.inp.tmpl > ww3_outp.inp
405-
406-
$EXECwave/ww3_outp ${WAV_MOD_TAG} 1> ww3_outp_bull.log 2>&1
407-
408389
fi
409390

410391
# --------------------------------------------------------------------------- #

0 commit comments

Comments
 (0)