Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync HAFS submodules and bring in HAFSv1 baseline configurations #166

Merged
merged 54 commits into from
Nov 30, 2022
Merged

Sync HAFS submodules and bring in HAFSv1 baseline configurations #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
b5ff81b
Add the capability and config option (use_orog_gsl) to generate GSL o…
BinLiu-NOAA Sep 11, 2022
0597504
Update submodule sorc/hafs_forecast.fd and sorc/hafs_utils.fd.
BinLiu-NOAA Oct 11, 2022
f98cd23
Adding upoff as a namelist parameter
BijuThomas-NOAA Oct 12, 2022
4f9c966
Merge remote-tracking branch 'origin/develop' into feature/hafs_ugwp_gsl
BinLiu-NOAA Oct 16, 2022
fb3131b
Merge remote-tracking branch 'remotes/origin/feature/hafs_ugwp_gsl' i…
BinLiu-NOAA Oct 16, 2022
9a83a8a
Covert TCL modulefiles to LUA format. Remove support to WCOSS(Cray an…
BijuThomas-NOAA Oct 18, 2022
b25d43f
Remove support to WCOSS(Cray and Dell)
BijuThomas-NOAA Oct 18, 2022
549e973
Covert TCL modulefiles to LUA format. Remove support to WCOSS(Cray an…
BijuThomas-NOAA Oct 18, 2022
f5c07e1
Update hafs_datool source code with MPI and OMP parallelization from …
BinLiu-NOAA Oct 21, 2022
d6e0658
Modernization for HAFS vortex initialization split source codes
Oct 21, 2022
2952153
Modernized HAFS VI codes and remove trailing white space
JunghoonShin-NOAA Oct 21, 2022
a4a4f25
Yonghui Weng's change for exhafs_atm_vi.sh to enable running atm_vi
BinLiu-NOAA Oct 21, 2022
140bc15
Updated exhafs_atm_vi.sh on top of Yonghui's change
JunghoonShin-NOAA Oct 21, 2022
a204026
Remove trailing whitespaces for hafs_datool source codes.
BinLiu-NOAA Oct 21, 2022
a271bd0
Update submodule hafs_forecast.fd after the momentum flux fix for HAF…
BinLiu-NOAA Oct 22, 2022
a96b0cb
*Merge remote-tracking branch 'remotes/origin/support/hafs.v0.3.1' into
BinLiu-NOAA Oct 22, 2022
fa0adf6
Enable generating regional ESG grid for standalone or regional
BinLiu-NOAA Oct 22, 2022
b8cb147
Merge remote-tracking branch 'remotes/origin/develop' into feature/ha…
BinLiu-NOAA Oct 24, 2022
8f0888e
Add some namelist options in input.nml.tmp and input_nest.nml.tmp.
BinLiu-NOAA Oct 26, 2022
67bc429
Update to use rocoto/1.3.5 version on WCOSS2.
BinLiu-NOAA Oct 27, 2022
510b978
Update submodule hafs_gsi.fd after being synced with GSI develop.
BinLiu-NOAA Oct 27, 2022
2a8d4fc
Update submodule hafs_forecast.fd, fixing the time string in the
BinLiu-NOAA Oct 28, 2022
400ac51
Merge remote-tracking branch 'remotes/origin/feature/hafs_sync_202210…
BinLiu-NOAA Nov 13, 2022
ebfb5e9
Update HAFS submodules hafs_forecast.fd, hafs_gsi.fd, hafs_utils.fd,
BinLiu-NOAA Nov 13, 2022
3fcba0e
*Add the config.parent_domain_center option to control how to set parent
BinLiu-NOAA Nov 14, 2022
05a6933
updating Datools to work of rdhpcs platforms
BijuThomas-NOAA Nov 14, 2022
7b1bbe9
Merge remote-tracking branch 'remotes/origin/feature/hafs_sync_202210…
BinLiu-NOAA Nov 14, 2022
f010d8b
Converting TCL based modeulefile to Lua format and updating inter-202…
BijuThomas-NOAA Nov 15, 2022
2c5e488
*Update to use ncdiag_cat from the external hpc-stack module/library.
BinLiu-NOAA Nov 15, 2022
fc88ebb
Updating to intel-2022 compiler(Hera)
BijuThomas-NOAA Nov 16, 2022
5a0af96
*Update submodule sorc/hafs_graphics.fd/emc_graphics.
BinLiu-NOAA Nov 16, 2022
88131be
Updating to intel-2022 compiler(Jet)
BijuThomas-NOAA Nov 16, 2022
22a67d1
Remove modulefile prefix in the modulefiles
BijuThomas-NOAA Nov 16, 2022
db723a6
*Update to use the new HYCOM NHC domain, with its north boundary exte…
BinLiu-NOAA Nov 17, 2022
d11fe66
Update del_time from 0.5 to 1.0 for NEXRAD DA in gsiparm.anl.tmp (sug…
BinLiu-NOAA Nov 17, 2022
a646bd3
Add LAUNCH_RESOURCES in rocoto site entity files and use it for the l…
BinLiu-NOAA Nov 17, 2022
422b2ba
Add HAFSv1s baseline conf and cronjob driver files.
BinLiu-NOAA Nov 17, 2022
51e65f0
Update module load line in jobs/JHAFS_EMCGRAPHICS.
BinLiu-NOAA Nov 17, 2022
19f2d35
Change minnum back to 1 for NEXRAD DA in analysis/gsi/gsiparm.anl.tmp…
BinLiu-NOAA Nov 17, 2022
37f72ac
Updating graphics modulefiles
BijuThomas-NOAA Nov 17, 2022
71de0fa
cronjob and parm/conf file clean ups.
BinLiu-NOAA Nov 17, 2022
ea2720d
Change hafs_workflow.xml.in to put the default comgraph dir under CDS…
BinLiu-NOAA Nov 17, 2022
d4308f0
*Update diag_table to fix surface flux and radiation flux variables.
BinLiu-NOAA Nov 18, 2022
9373e18
Revert "*Update to use the new HYCOM NHC domain, with its north bound…
BinLiu-NOAA Nov 18, 2022
418b63c
Rename hafsv1s_baseline conf and cronjob driver into hafsv1b_baseline.
BinLiu-NOAA Nov 18, 2022
8e204c0
Fix mpi_bcast related issue in hafs_datool sub_hafsvi_proc.f90 on wco…
BinLiu-NOAA Nov 19, 2022
3956088
Bug fix for hafs_tools.fd/sorc/hafs_vi/split/WNLSM.f90 so that it can…
BinLiu-NOAA Nov 19, 2022
f35504a
*Update sorc/machine-setup.sh and ush/hafs_pre_job.sh.inc.
BinLiu-NOAA Nov 19, 2022
9ddc155
Turn on emcgraphics in cronjob_hafsv1a_baseline.sh and cronjob_hafsv1…
BinLiu-NOAA Nov 19, 2022
d001be5
Update sorc/machine-setup.sh and ush/hafs_pre_job.sh.inc so that the …
BinLiu-NOAA Nov 20, 2022
7542163
Switch to mesh cap based WW3 coupling at the HAFS application/workflo…
BinLiu-NOAA Nov 27, 2022
584b41c
Delete system.conf.wcoss_cray and system.conf.wcoss_dell_p3.
BinLiu-NOAA Nov 27, 2022
eedf892
Update parm/system.conf.wcoss2 and rocoto/sites/wcoss2.ent.
BinLiu-NOAA Nov 28, 2022
550c698
Update submodule sorc/hafs_forecast.fd and .gitmodules.
BinLiu-NOAA Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[submodule "ufs-weather-model"]
path = sorc/hafs_forecast.fd
url = https://github.com/hafs-community/ufs-weather-model.git
branch = support/HAFS
branch = support/HAFS
[submodule "UFS_UTILS"]
path = sorc/hafs_utils.fd
url = https://github.com/hafs-community/UFS_UTILS.git
branch = support/HAFS
branch = support/HAFS
[submodule "gfdl-tracker"]
path = sorc/hafs_tracker.fd
url = https://github.com/hafs-community/gfdl-tracker.git
Expand Down
10 changes: 7 additions & 3 deletions jobs/JHAFS_ANALYSIS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
#module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
#module load modulefile.ProdGSI.${machine}
module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
if [ ${machine} = "hera" ]; then
module load gsi_${machine}.intel
else
module load gsi_${machine}
fi
module list
fi

Expand Down
10 changes: 7 additions & 3 deletions jobs/JHAFS_ANALYSIS_VR
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
#module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
#module load modulefile.ProdGSI.${machine}
module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
if [ ${machine} = "hera" ]; then
module load gsi_${machine}.intel
else
module load gsi_${machine}
fi
module list
fi

Expand Down
2 changes: 1 addition & 1 deletion jobs/JHAFS_ATM_IC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
Expand Down
18 changes: 2 additions & 16 deletions jobs/JHAFS_ATM_INIT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,10 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
#module list
#module unload intelpython
#module use ${HOMEhafs}/sorc/hafs_forecast.fd/modulefiles
#if [ "${machine}" = "wcoss_cray" ] || [ "${machine}" = "wcoss_dell_p3" ]; then
# module load ufs_${machine}
#else
# module load ufs_${machine}.intel
#fi
module list
fi

Expand Down Expand Up @@ -243,13 +235,7 @@ echo "export neststr=$neststr tilestr=${tilestr} gridstr=${gridstr}; ${HOMEhafs}
done

chmod +x cmdfile_product
if [ ${machine} = "wcoss_cray" ]; then
export OMP_NUM_THREADS=1
export APRUNF="aprun -b -j1 -n2 -N1 -d1 -cc depth cfp"
${APRUNF} cmdfile_product
else
${APRUNC} ${MPISERIAL} -m cmdfile_product
fi
${APRUNC} ${MPISERIAL} -m cmdfile_product

for ng in $(seq 1 ${ngrids});
do
Expand Down
4 changes: 2 additions & 2 deletions jobs/JHAFS_ATM_LBC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
Expand All @@ -37,7 +37,7 @@ export COMIN=${COMIN:?}
export COMOUT=${COMOUT:?}
export COMhafs=${COMhafs:-${COMOUT}}

export COMgfs=${COMgfs:-/gpfs/dell1/nco/ops/com/gfs/para}
export COMgfs=${COMgfs:-/lfs/h2/emc/hur/noscrub/hafs-input/COMGFSv16}

export CDATE=${CDATE:-${YMDH}}
export cyc=${cyc:?}
Expand Down
3 changes: 2 additions & 1 deletion jobs/JHAFS_ATM_POST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
# module purge
module use ${HOMEhafs}/sorc/hafs_post.fd/modulefiles
module load ${machine}
module list
Expand Down
14 changes: 13 additions & 1 deletion jobs/JHAFS_ATM_PREP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
Expand Down Expand Up @@ -61,6 +61,12 @@ if [ ${ENSDA} = YES ]; then
export target_lon=${target_lon_ens:--62.0}
export target_lat=${target_lat_ens:-22.0}
export refine_ratio=${refine_ratio_ens:-4}
export regional_esg=${regional_esg_ens:-no}
export idim_nest=${idim_nest_ens:-1320}
export jdim_nest=${jdim_nest_ens:-1320}
export delx_nest=${delx_nest_ens:-0.03}
export dely_nest=${dely_nest_ens:-0.03}
export halop2=${halop2_ens:-5}
export OUTDIR=${OUTDIR:-${WORKhafs}/intercom/grid_ens/${CASE}}
export DATA=${WORKhafs}/atm_prep_ens
else
Expand Down Expand Up @@ -113,6 +119,12 @@ export istart_nest=${istart_nest_mvnest1res:-46}
export jstart_nest=${jstart_nest_mvnest1res:-238}
export iend_nest=${iend_nest_mvnest1res:-1485}
export jend_nest=${jend_nest_mvnest1res:-1287}
export regional_esg=${regional_esg_mvnest1res:-no}
export idim_nest=${idim_nest_mvnest1res:-3960}
export jdim_nest=${jdim_nest_mvnest1res:-3960}
export delx_nest=${delx_nest_mvnest1res:-0.01}
export dely_nest=${dely_nest_mvnest1res:-0.01}
export halop2=${halop2_mvnest1res:-15}

export OUTDIR=${WORKhafs}/intercom/grid_mvnest1res/${CASE}
export DATA=${WORKhafs}/atm_prep_mvnest1res
Expand Down
4 changes: 2 additions & 2 deletions jobs/JHAFS_ATM_VI
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
module use ${HOMEhafs}/modulefiles
module load modulefile.hafs.${machine}
module load hafs.${machine}
module list
fi

Expand Down
4 changes: 2 additions & 2 deletions jobs/JHAFS_EMCGRAPHICS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
module use ${HOMEhafs}/sorc/hafs_graphics.fd/emc_graphics/modulefiles
module load modulefile.graphics.run.${machine}
module load graphics.run.${machine}
module list
fi

Expand Down
2 changes: 1 addition & 1 deletion jobs/JHAFS_ENKF_HX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
Expand Down
10 changes: 7 additions & 3 deletions jobs/JHAFS_ENKF_MEAN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
#module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
#module load modulefile.ProdGSI.${machine}
module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
if [ ${machine} = "hera" ]; then
module load gsi_${machine}.intel
else
module load gsi_${machine}
fi
module list
fi

Expand Down
10 changes: 7 additions & 3 deletions jobs/JHAFS_ENKF_RECENTER
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
#module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
#module load modulefile.ProdGSI.${machine}
module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
if [ ${machine} = "hera" ]; then
module load gsi_${machine}.intel
else
module load gsi_${machine}
fi
module list
fi

Expand Down
10 changes: 7 additions & 3 deletions jobs/JHAFS_ENKF_UPDATE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
#module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
#module load modulefile.ProdGSI.${machine}
module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
if [ ${machine} = "hera" ]; then
module load gsi_${machine}.intel
else
module load gsi_${machine}
fi
module list
fi

Expand Down
7 changes: 1 addition & 6 deletions jobs/JHAFS_FORECAST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,13 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
#module list
#module unload intelpython
#module use ${HOMEhafs}/sorc/hafs_forecast.fd/modulefiles
#if [ "${machine}" = "wcoss_cray" ] || [ "${machine}" = "wcoss_dell_p3" ]; then
# module load ufs_${machine}
#else
# module load ufs_${machine}.intel
#fi
module list
fi

Expand Down
2 changes: 1 addition & 1 deletion jobs/JHAFS_HRDGRAPHICS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export GPLOT_DIR=${GPLOThafs}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
Expand Down
4 changes: 2 additions & 2 deletions jobs/JHAFS_MERGE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
module use ${HOMEhafs}/modulefiles
module load modulefile.hafs.${machine}
module load hafs.${machine}
module list
fi

Expand Down
4 changes: 2 additions & 2 deletions jobs/JHAFS_OBS_PROC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
module use ${HOMEhafs}/modulefiles
module load modulefile.hafs.${machine}
module load hafs.${machine}
module list
fi

Expand Down
4 changes: 2 additions & 2 deletions jobs/JHAFS_OCN_POST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
module use ${HOMEhafs}/modulefiles
module load modulefile.hafs.${machine}
module load hafs.${machine}
module list
fi

Expand Down
4 changes: 2 additions & 2 deletions jobs/JHAFS_OCN_PREP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
module use ${HOMEhafs}/modulefiles
module load modulefile.hafs.${machine}
module load hafs.${machine}
module list
fi

Expand Down
10 changes: 3 additions & 7 deletions jobs/JHAFS_PRODUCT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
module use ${HOMEhafs}/modulefiles
module load modulefile.hafs.${machine}
module load hafs.${machine}
module list
fi

Expand Down Expand Up @@ -89,11 +89,7 @@ echo "export neststr=$neststr tilestr=${tilestr} gridstr=${gridstr}; ${HOMEhafs}
done

chmod +x cmdfile_product
if [ ${machine} = "wcoss_cray" ]; then
export OMP_NUM_THREADS=1
export APRUNF="aprun -b -j1 -n2 -N1 -d1 -cc depth cfp"
${APRUNF} cmdfile_product
elif [ ${machine} = "wcoss2" ]; then
if [ ${machine} = "wcoss2" ]; then
ncmd=$(cat ./cmdfile_product | wc -l)
ncmd_max=$((ncmd < TOTAL_TASKS ? ncmd : TOTAL_TASKS))
${APRUNCFP} -n ${ncmd_max} cfp ./cmdfile_product
Expand Down
4 changes: 2 additions & 2 deletions jobs/JHAFS_WAV_POST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export FIXhafs=${FIXhafs:-${HOMEhafs}/fix}
source ${USHhafs}/hafs_pre_job.sh.inc
source ${HOLDVARS:-storm1.holdvars.txt}

export machine=${WHERE_AM_I:-wcoss_cray}
export machine=${WHERE_AM_I:-wcoss2}
export envir=${envir:-prod} # prod, para, test
export RUN_ENVIR=${RUN_ENVIR:-dev} # nco or dev
if [ "${RUN_ENVIR^^}" != NCO ]; then
module use ${HOMEhafs}/modulefiles
module load modulefile.hafs.${machine}
module load hafs.${machine}
module list
fi

Expand Down
Loading