Revert "Activation/deactivation of ad-hoc stochastic physics schemes (#…

…284)" (#288) This reverts commit 4d3b156.
ufs-community · Sep 10, 2020 · 7c12174 · 7c12174
1 parent 4d3b156
commit 7c12174
Show file tree

Hide file tree

Showing 43 changed files with 678 additions and 509 deletions.
diff --git a/jobs/JREGIONAL_MAKE_ICS b/jobs/JREGIONAL_MAKE_ICS
@@ -91,6 +91,16 @@ esac
 #
 #-----------------------------------------------------------------------
 #
+# Find the directory in which the wgrib2 executable is located.
+#
+#-----------------------------------------------------------------------
+#
+wgrib2_dir=$( which wgrib2 ) || print_err_msg_exit "\
+Directory in which the wgrib2 executable is located could not be found:
+  wgrib2_dir = \"${wgrib2_dir}\""
+#
+#-----------------------------------------------------------------------
+#
 # Set the name of and create the directory in which the output from this
 # script will be placed (if that directory doesn't already exist).
 #
@@ -107,6 +117,7 @@ mkdir_vrfy -p "${ics_dir}"
 #
 $SCRIPTSDIR/exregional_make_ics.sh \
   ics_dir="${ics_dir}" \
+  wgrib2_dir="${wgrib2_dir}" \
   APRUN="${APRUN}" || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."

diff --git a/jobs/JREGIONAL_MAKE_LBCS b/jobs/JREGIONAL_MAKE_LBCS
@@ -92,6 +92,16 @@ esac
 #
 #-----------------------------------------------------------------------
 #
+# Find the directory in which the wgrib2 executable is located.
+#
+#-----------------------------------------------------------------------
+#
+wgrib2_dir=$( which wgrib2 ) || print_err_msg_exit "\
+Directory in which the wgrib2 executable is located could not be found:
+  wgrib2_dir = \"${wgrib2_dir}\""
+#
+#-----------------------------------------------------------------------
+#
 # Set the name of and create the directory in which the output from this
 # script will be placed (if it doesn't already exist).
 #
@@ -108,6 +118,7 @@ mkdir_vrfy -p "${lbcs_dir}"
 #
 $SCRIPTSDIR/exregional_make_lbcs.sh \
   lbcs_dir="${lbcs_dir}" \
+  wgrib2_dir="${wgrib2_dir}" \
   APRUN="${APRUN}" || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."

diff --git a/modulefiles/codes/cheyenne/global_equiv_resol b/modulefiles/codes/cheyenne/global_equiv_resol
@@ -0,0 +1,10 @@
+#%Module#####################################################
+## Module file for global_equiv_resol on NCAR/UCAR Cheyenne
+#############################################################
+module purge
+module load ncarenv/1.3
+module load intel/18.0.5
+module load ncarcompilers/0.5.0
+module load netcdf/4.6.3
+# No hdf5 loaded since netcdf and hdf5 reside together on cheyenne
+
diff --git a/modulefiles/codes/cheyenne/mosaic_file b/modulefiles/codes/cheyenne/mosaic_file
@@ -0,0 +1,10 @@
+#%Module#####################################################
+## Module file for mosaic_file on NCAR/UCAR Cheyenne
+#############################################################
+module purge
+module load ncarenv/1.3
+module load intel/18.0.5
+module load ncarcompilers/0.5.0
+module load impi/2018.4.274
+module load netcdf/4.6.3
+# No hdf5 loaded since netcdf and hdf5 reside together on cheyenne
diff --git a/modulefiles/codes/cheyenne/regional_grid b/modulefiles/codes/cheyenne/regional_grid
@@ -0,0 +1,10 @@
+#%Module#####################################################
+## Module file for regional_grid on NCAR/UCAR Cheyenne
+#############################################################
+module purge
+module load ncarenv/1.3
+module load intel/18.0.5
+module load ncarcompilers/0.5.0
+module load impi/2018.4.274
+module load netcdf/4.6.3
+# No hdf5 loaded since netcdf and hdf5 reside together on cheyenne
diff --git a/modulefiles/codes/hera/global_equiv_resol b/modulefiles/codes/hera/global_equiv_resol
@@ -0,0 +1,7 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module purge
+module load intel/18.0.5.274
+module load netcdf/4.6.1
+module load hdf5/1.10.4
diff --git a/modulefiles/codes/hera/mosaic_file b/modulefiles/codes/hera/mosaic_file
@@ -0,0 +1,7 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module purge
+module load intel/18.0.5.274
+module load netcdf/4.6.1
+module load hdf5/1.10.4
diff --git a/modulefiles/codes/hera/regional_grid b/modulefiles/codes/hera/regional_grid
@@ -0,0 +1,7 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module purge
+module load intel/18.0.5.274
+module load netcdf/4.6.1
+module load hdf5/1.10.4
diff --git a/modulefiles/codes/jet/global_equiv_resol b/modulefiles/codes/jet/global_equiv_resol
@@ -0,0 +1,7 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module purge
+module load intel/18.0.5.274
+module load netcdf/4.6.1
+module load hdf5/1.10.4
diff --git a/modulefiles/codes/jet/mosaic_file b/modulefiles/codes/jet/mosaic_file
@@ -0,0 +1,7 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module purge
+module load intel/18.0.5.274
+module load netcdf/4.6.1
+module load hdf5/1.10.4
diff --git a/modulefiles/codes/jet/regional_grid b/modulefiles/codes/jet/regional_grid
@@ -0,0 +1,8 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module purge
+module load intel/18.0.5.274
+module load netcdf/4.7.0
+module load hdf5/1.10.5
+
diff --git a/modulefiles/codes/odin/global_equiv_resol b/modulefiles/codes/odin/global_equiv_resol
@@ -0,0 +1,13 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module load PrgEnv-intel
+module swap intel/19.0.5.281
+module load cray-mpich/7.7.10
+module load cray-libsci
+module load cray-netcdf-hdf5parallel
+module load cray-parallel-netcdf
+module load cray-hdf5-parallel
+
+export NETCDF=/opt/cray/pe/netcdf-hdf5parallel/4.6.3.2/INTEL/19.0
+export HDF5=/opt/cray/pe/hdf5-parallel/1.10.5.2/INTEL/19.0
diff --git a/modulefiles/codes/odin/mosaic_file b/modulefiles/codes/odin/mosaic_file
@@ -0,0 +1,13 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module load PrgEnv-intel
+module swap intel/19.0.5.281
+module load cray-mpich/7.7.10
+module load cray-libsci
+module load cray-netcdf-hdf5parallel
+module load cray-parallel-netcdf
+module load cray-hdf5-parallel
+
+export NETCDF=/opt/cray/pe/netcdf-hdf5parallel/4.6.3.2/INTEL/19.0
+export HDF5=/opt/cray/pe/hdf5-parallel/1.10.5.2/INTEL/19.0
diff --git a/modulefiles/codes/odin/regional_grid b/modulefiles/codes/odin/regional_grid
@@ -0,0 +1,11 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module load PrgEnv-intel
+module swap intel/19.0.5.281
+module load cray-mpich/7.7.10
+module load cray-libsci
+module load cray-netcdf-hdf5parallel
+module load cray-parallel-netcdf
+module load cray-hdf5-parallel
+
diff --git a/modulefiles/codes/stampede/global_equiv_resol b/modulefiles/codes/stampede/global_equiv_resol
@@ -0,0 +1,10 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module load intel/18.0.2
+module load impi/18.0.2
+module load hdf5/1.10.4
+module load netcdf/4.6.2
+
+setenv NETCDF /opt/apps/intel18/netcdf/4.6.2/x86_64
+setenv HDF5 /opt/apps/intel18/hdf5/1.10.4/x86_64
diff --git a/modulefiles/codes/stampede/mosaic_file b/modulefiles/codes/stampede/mosaic_file
@@ -0,0 +1,12 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+
+
+module load intel/18.0.2
+module load impi/18.0.2
+module load hdf5/1.10.4
+module load netcdf/4.6.2
+
+setenv  NETCDF /opt/apps/intel18/netcdf/4.6.2/x86_64
+setenv  HDF5 /opt/apps/intel18/hdf5/1.10.4/x86_64
diff --git a/modulefiles/codes/stampede/regional_grid b/modulefiles/codes/stampede/regional_grid
@@ -0,0 +1,10 @@
+#%Module#####################################################
+## Module file for regional_grid
+#############################################################
+module load intel/18.0.2
+module load impi/18.0.2
+module load hdf5/1.10.4
+module load netcdf/4.6.2
+
+setenv NETCDF /opt/apps/intel18/netcdf/4.6.2/x86_64
+setenv HDF5 /opt/apps/intel18/hdf5/1.10.4/x86_64
diff --git a/modulefiles/tasks/cheyenne/make_grid b/modulefiles/tasks/cheyenne/make_grid
@@ -0,0 +1,15 @@
+#%Module#####################################################
+
+module purge
+
+module load ncarenv/1.3
+module load intel/19.0.2
+module load ncarcompilers/0.5.0
+module load netcdf/4.6.3
+
+if [module-info mode load] {
+  system "ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427"
+}
+if [module-info mode remove] {
+  system "deactivate"
+}
diff --git a/modulefiles/tasks/cheyenne/make_grid.local b/modulefiles/tasks/cheyenne/make_grid.local
diff --git a/modulefiles/tasks/hera/make_grid b/modulefiles/tasks/hera/make_grid
@@ -0,0 +1,15 @@
+#%Module#####################################################
+## Module file for make_grid task.
+#############################################################
+
+module purge
+
+module load intel/18.0.5.274
+module load netcdf/4.7.0
+module load hdf5/1.10.5
+
+module use -a /contrib/miniconda3/modulefiles
+module load miniconda3
+if [module-info mode load] {
+  system "conda activate regional_workflow"
+}
diff --git a/modulefiles/tasks/hera/make_grid.local b/modulefiles/tasks/hera/make_grid.local
diff --git a/modulefiles/tasks/hera/make_ics.local b/modulefiles/tasks/hera/make_ics.local
@@ -2,6 +2,4 @@ module load wgrib2
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+conda activate regional_workflow
diff --git a/modulefiles/tasks/hera/make_lbcs.local b/modulefiles/tasks/hera/make_lbcs.local
@@ -2,6 +2,4 @@ module load wgrib2
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+conda activate regional_workflow
diff --git a/modulefiles/tasks/jet/make_grid b/modulefiles/tasks/jet/make_grid
@@ -0,0 +1,15 @@
+#%Module#####################################################
+## Module file for make_grid task.
+#############################################################
+
+module purge
+
+module load intel/18.0.5.274
+module load netcdf/4.7.0
+module load hdf5/1.10.5
+
+module use -a /contrib/miniconda3/modulefiles
+module load miniconda3
+if [module-info mode load] {
+  system "conda activate regional_workflow"
+}
diff --git a/modulefiles/tasks/jet/make_grid.local b/modulefiles/tasks/jet/make_grid.local
diff --git a/modulefiles/tasks/jet/make_ics.local b/modulefiles/tasks/jet/make_ics.local
@@ -2,6 +2,4 @@ module load wgrib2/2.0.8
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+conda activate regional_workflow
diff --git a/modulefiles/tasks/jet/make_lbcs.local b/modulefiles/tasks/jet/make_lbcs.local
@@ -2,6 +2,4 @@ module load wgrib2/2.0.8
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+conda activate regional_workflow
diff --git a/modulefiles/tasks/odin/make_grid b/modulefiles/tasks/odin/make_grid
@@ -0,0 +1,14 @@
+#%Module#####################################################
+## Module file for make_grid task.
+#############################################################
+
+#module purge
+
+module load PrgEnv-intel
+module swap intel/19.0.5.281
+module load cray-libsci
+module load cray-netcdf-hdf5parallel
+module load cray-parallel-netcdf
+module load cray-hdf5-parallel
+module load gcc/6.1.0
+module load slurm
diff --git a/modulefiles/tasks/stampede/make_grid b/modulefiles/tasks/stampede/make_grid
@@ -0,0 +1,11 @@
+#%Module#####################################################
+## Module file for make_grid task.
+#############################################################
+
+module purge
+
+module load intel/18.0.2
+module load impi/18.0.2
+module load hdf5/1.10.4
+module load netcdf/4.6.2
+module load python3/3.7.0
diff --git a/modulefiles/tasks/wcoss_cray/make_grid.local b/modulefiles/tasks/wcoss_cray/make_grid.local
diff --git a/modulefiles/tasks/wcoss_dell_p3/make_grid.local b/modulefiles/tasks/wcoss_dell_p3/make_grid.local
diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh
@@ -372,7 +372,9 @@ generation executable (exec_fp):
     'dely': ${DEL_ANGLE_Y_SG},
     'lx': ${NEG_NX_OF_DOM_WITH_WIDE_HALO},
     'ly': ${NEG_NY_OF_DOM_WITH_WIDE_HALO},
- }
+    'a': ${ESGgrid_ALPHA_PARAM},
+    'k': ${ESGgrid_KAPPA_PARAM},
+}
 "
 #
 # Call the python script to create the namelist file.