Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions modulefiles/tasks/wcoss2/analysis_gsi.local.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ load(pathJoin("crtm", os.getenv("crtm_ver")))
load(pathJoin("udunits", os.getenv("udunits_ver")))
load(pathJoin("gsl", os.getenv("gsl_ver")))
load(pathJoin("nco", os.getenv("nco_ver")))

1 change: 0 additions & 1 deletion modulefiles/tasks/wcoss2/enkfupdt.local.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver")))
load(pathJoin("intel", os.getenv("intel_ver")))
load(pathJoin("craype", os.getenv("craype_ver")))
load(pathJoin("python", os.getenv("python_ver")))
Expand Down
7 changes: 3 additions & 4 deletions modulefiles/tasks/wcoss2/make_ics.local.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver")))
load(pathJoin("intel", os.getenv("intel_ver")))
load(pathJoin("craype", os.getenv("craype_ver")))
load(pathJoin("python", os.getenv("python_ver")))
Expand All @@ -13,7 +12,7 @@ load(pathJoin("pnetcdf-D", os.getenv("pnetcdf_ver")))
load(pathJoin("bacio", os.getenv("bacio_ver")))
load(pathJoin("w3emc", os.getenv("w3emc_ver")))
load(pathJoin("nemsio", os.getenv("nemsio_ver")))
load(pathJoin("libaec",os.getenv("libaec_ver")))
load(pathJoin("g2c",os.getenv("g2c_ver")))
load(pathJoin("libjpeg-turbo",os.getenv("libjpeg_turbo_ver")))
load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
load(pathJoin("udunits", os.getenv("udunits_ver")))
load(pathJoin("gsl", os.getenv("gsl_ver")))
load(pathJoin("nco", os.getenv("nco_ver")))
5 changes: 4 additions & 1 deletion modulefiles/tasks/wcoss2/make_lbcs.local.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver")))
load(pathJoin("intel", os.getenv("intel_ver")))
load(pathJoin("craype", os.getenv("craype_ver")))
load(pathJoin("python", os.getenv("python_ver")))
Expand All @@ -14,7 +13,11 @@ load(pathJoin("pnetcdf-D", os.getenv("pnetcdf_ver")))
load(pathJoin("bacio", os.getenv("bacio_ver")))
load(pathJoin("w3emc", os.getenv("w3emc_ver")))
load(pathJoin("nemsio", os.getenv("nemsio_ver")))
load(pathJoin("libaec",os.getenv("libaec_ver")))
load(pathJoin("g2c",os.getenv("g2c_ver")))
load(pathJoin("libjpeg-turbo",os.getenv("libjpeg_turbo_ver")))
load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
load(pathJoin("udunits", os.getenv("udunits_ver")))
load(pathJoin("gsl", os.getenv("gsl_ver")))
load(pathJoin("nco", os.getenv("nco_ver")))

4 changes: 3 additions & 1 deletion modulefiles/tasks/wcoss2/post.local.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
unload("PrgEnv-intel")
unload("netcdf")

load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver")))
load(pathJoin("intel", os.getenv("intel_ver")))
load(pathJoin("craype", os.getenv("craype_ver")))
load(pathJoin("python", os.getenv("python_ver")))
Expand All @@ -14,4 +13,7 @@ load(pathJoin("hdf5-D", os.getenv("hdf5_ver")))
load(pathJoin("netcdf-D", os.getenv("netcdf_ver")))
load(pathJoin("pnetcdf-D", os.getenv("pnetcdf_ver")))
load(pathJoin("libjpeg", os.getenv("libjpeg_ver")))
load(pathJoin("libaec",os.getenv("libaec_ver")))
load(pathJoin("g2c",os.getenv("g2c_ver")))
load(pathJoin("libjpeg-turbo",os.getenv("libjpeg_turbo_ver")))
load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
9 changes: 4 additions & 5 deletions modulefiles/tasks/wcoss2/prdgen.local.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

load(pathJoin("cfp", os.getenv("cfp_ver")))

load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver")))
load(pathJoin("intel", os.getenv("intel_ver")))
load(pathJoin("craype", os.getenv("craype_ver")))
load(pathJoin("python", os.getenv("python_ver")))
Expand All @@ -11,10 +11,9 @@ load(pathJoin("cray-pals", os.getenv("cray_pals_ver")))
load(pathJoin("hdf5-D", os.getenv("hdf5_ver")))
load(pathJoin("netcdf-D", os.getenv("netcdf_ver")))
load(pathJoin("pnetcdf-D", os.getenv("pnetcdf_ver")))
load(pathJoin("libaec",os.getenv("libaec_ver")))
load(pathJoin("g2c",os.getenv("g2c_ver")))
load(pathJoin("libjpeg-turbo",os.getenv("libjpeg_turbo_ver")))
load(pathJoin("wgrib2", os.getenv("wgrib2_ver")))
load(pathJoin("libjpeg", os.getenv("libjpeg_ver")))
load(pathJoin("grib_util", os.getenv("grib_util_ver")))

load(pathJoin("udunits", os.getenv("udunits_ver")))
load(pathJoin("gsl", os.getenv("gsl_ver")))
load(pathJoin("nco", os.getenv("nco_ver")))
2 changes: 1 addition & 1 deletion modulefiles/wflow_wcoss2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ prepend_path("MODULEPATH", os.getenv("modulepath_mpi"))
load(pathJoin("crtm", os.getenv("crtm_ver")))

prepend_path("MODULEPATH","/apps/ops/test/nco/modulefiles")
load(pathJoin("core/rocoto", os.getenv("rocoto_ver")))
load(pathJoin("core/rocoto", os.getenv("rocoto_ver") or "1.3.5"))

3,719 changes: 3,719 additions & 0 deletions parm/FV3LAM_wflow_nco.xml

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions scripts/exrrfs_analysis_enkf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ case $MACHINE in
export OMP_PROC_BIND=close
export OMP_PLACES=threads
export MPICH_RANK_REORDER_METHOD=0
ncores=160
PPN_ANALYSIS_ENKF=8

ncores=$(( PPN_ANALYSIS_ENKF*NNODES_ANALYSIS_ENKF ))
APRUN="mpiexec -n ${ncores} -ppn ${PPN_ANALYSIS_ENKF} --label --line-buffer --cpu-bind core --depth ${OMP_NUM_THREADS}"
;;
#
Expand Down
1 change: 1 addition & 0 deletions ush/config_defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ RUN="experiment_name"
RUN_ensctrl="experiment_name"
TAG="dev_grid"
WGF="det"
DCOM_ROOT="/path/of/observation"
PTMP="/base/path/of/directory/containing/postprocessed/output/files"
ENSCTRL_PTMP="/base/path/of/directory/containing/postprocessed/output/files"
GESROOT="/base/path/of/directory/containing/model/output/files"
Expand Down
Loading