Activation/deactivation of ad-hoc stochastic physics schemes (#284)

* Remove all references to /lfs3 on Jet * Add Ben and Ratko to the CODEOWNERS file * Replace hard-coded make_orog module file with build-level module file in UFS_UTILS * Remove hard-coded make_sfc_climo module file * Add changes for merged chgres_cube code * Add changes for merged chgres_cube code * Minor tweak to FCST_LEN_HRS default in config.community.sh * Changes to make the release version of chgres_cube run in regional_workflow * Changes for regional_grid build on Jet * Changes to regional_grid build for Hera * Change regional_grid makefile for hera * Remove leading zero from FCST_LEN_HRS in config.community.sh * Remove /sorc directory * Remove build module files for codes originally in the regional_workflow repository. Remove run-time make_grid module file for all platforms. Will be sourced from UFS_UTILS from now on. * Update regional grid template for newest code * Copy make_grid module file from UFS_UTILS * Add make_grid.local file for most platforms * Remove alpha and kappa parameters from the regional_grid namelist * Modifications to file type conventions in the chgres_cube namelist for FV3GFS and GSMGFS nemsio files * Set convert_nst=False for global grib2 FV3GFS files when running chgres_cube * Add tracers back into nemsio file processing * Changes to the make_lbcs ex-script (remove all surface-related variables) * Fix for modulefiles * Fixes after merging authoritative repo into fork * Add Thompson climo to chgres_cube namelist for appropriate external model/SDF combinations * Commit new locations for Thompson climo fix file * Change FIXsar to FIXLAM * Change gfs_bndy.nc to gfs.bndy.nc * Move file * Bug fixes to setup.sh and exregional_make_ics.sh * Add support for NAM grib2 files * Path fix * Typo fix * Fix extension on UPP grib2 files * Bug fix for if statement * Add .grib2 extension to soft links * Fix nsoill_out values based on LSM scheme in CCPP suite * Fix grib2 extensions * Add if statement for varmap tables when using Thompson MP and initializing from non-RAP/HRRR data * Final modifications to support NAM grib2 files in regional_workflow * Set climo as default for soil variables when using HRRRX (user will need change this if they know these variables are available for the dates they are running). * Add FV3_CPT_v0 to varmap if statement * Changes to post file names to make model lowercase and move ${fhr} to three values instead of two * Change "rrfs" to "${NET}" instead * Revert "Add FV3_CPT_v0 to varmap if statement" This reverts commit b04ad0b. * Add if statement to set all ad-hoc scheme magnitudes to -999.0 if not being used.
ufs-community · Sep 10, 2020 · 465416f · 465416f
1 parent 9148076
commit 465416f
Show file tree

Hide file tree

Showing 76 changed files with 509 additions and 6,742 deletions.
diff --git a/jobs/JREGIONAL_MAKE_ICS b/jobs/JREGIONAL_MAKE_ICS
@@ -91,16 +91,6 @@ 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).
 #
@@ -117,7 +107,6 @@ 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,16 +92,6 @@ 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).
 #
@@ -118,7 +108,6 @@ 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
diff --git a/modulefiles/codes/cheyenne/mosaic_file b/modulefiles/codes/cheyenne/mosaic_file
diff --git a/modulefiles/codes/cheyenne/regional_grid b/modulefiles/codes/cheyenne/regional_grid
diff --git a/modulefiles/codes/hera/global_equiv_resol b/modulefiles/codes/hera/global_equiv_resol
diff --git a/modulefiles/codes/hera/mosaic_file b/modulefiles/codes/hera/mosaic_file
diff --git a/modulefiles/codes/hera/regional_grid b/modulefiles/codes/hera/regional_grid
diff --git a/modulefiles/codes/jet/global_equiv_resol b/modulefiles/codes/jet/global_equiv_resol
diff --git a/modulefiles/codes/jet/mosaic_file b/modulefiles/codes/jet/mosaic_file
diff --git a/modulefiles/codes/jet/regional_grid b/modulefiles/codes/jet/regional_grid
diff --git a/modulefiles/codes/odin/global_equiv_resol b/modulefiles/codes/odin/global_equiv_resol
diff --git a/modulefiles/codes/odin/mosaic_file b/modulefiles/codes/odin/mosaic_file
diff --git a/modulefiles/codes/odin/regional_grid b/modulefiles/codes/odin/regional_grid
diff --git a/modulefiles/codes/stampede/global_equiv_resol b/modulefiles/codes/stampede/global_equiv_resol
diff --git a/modulefiles/codes/stampede/mosaic_file b/modulefiles/codes/stampede/mosaic_file
diff --git a/modulefiles/codes/stampede/regional_grid b/modulefiles/codes/stampede/regional_grid
diff --git a/modulefiles/tasks/cheyenne/make_grid b/modulefiles/tasks/cheyenne/make_grid
diff --git a/modulefiles/tasks/cheyenne/make_grid.local b/modulefiles/tasks/cheyenne/make_grid.local
@@ -0,0 +1,2 @@
+
+ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427
diff --git a/modulefiles/tasks/hera/make_grid b/modulefiles/tasks/hera/make_grid
diff --git a/modulefiles/tasks/hera/make_grid.local b/modulefiles/tasks/hera/make_grid.local
@@ -0,0 +1,6 @@
+
+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_ics.local b/modulefiles/tasks/hera/make_ics.local
@@ -2,4 +2,6 @@ module load wgrib2
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-conda activate regional_workflow
+if [module-info mode load] {
+  system "conda activate regional_workflow"
+}
diff --git a/modulefiles/tasks/hera/make_lbcs.local b/modulefiles/tasks/hera/make_lbcs.local
@@ -2,4 +2,6 @@ module load wgrib2
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-conda activate regional_workflow
+if [module-info mode load] {
+  system "conda activate regional_workflow"
+}
diff --git a/modulefiles/tasks/jet/make_grid b/modulefiles/tasks/jet/make_grid
diff --git a/modulefiles/tasks/jet/make_grid.local b/modulefiles/tasks/jet/make_grid.local
@@ -0,0 +1,6 @@
+
+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_ics.local b/modulefiles/tasks/jet/make_ics.local
@@ -2,4 +2,6 @@ module load wgrib2/2.0.8
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-conda activate regional_workflow
+if [module-info mode load] {
+  system "conda activate regional_workflow"
+}
diff --git a/modulefiles/tasks/jet/make_lbcs.local b/modulefiles/tasks/jet/make_lbcs.local
@@ -2,4 +2,6 @@ module load wgrib2/2.0.8
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-conda activate regional_workflow
+if [module-info mode load] {
+  system "conda activate regional_workflow"
+}
diff --git a/modulefiles/tasks/odin/make_grid b/modulefiles/tasks/odin/make_grid
diff --git a/modulefiles/tasks/stampede/make_grid b/modulefiles/tasks/stampede/make_grid
diff --git a/modulefiles/tasks/wcoss_cray/make_grid.local b/modulefiles/tasks/wcoss_cray/make_grid.local
@@ -0,0 +1,33 @@
+module load modules
+
+module load xt-lsfhpc
+module load ncep
+module load alps
+module load dvs
+module load xpmem
+module load ugni
+module load craype-network-aries
+module load switch
+module load rca
+module load gni-headers
+module load udreg
+module load hpss
+
+module load prod_util
+module load g2tmpl-intel/1.4.0
+module load crtm-intel/2.2.6
+module load iobuf/2.0.7
+module load gempak/7.3.0
+
+module load nco-gnu-sandybridge/4.4.4
+module load NetCDF-intel-sandybridge/4.2
+module load cfp-intel-sandybridge/1.1.0
+export USE_CFP=YES
+
+module load grib_util/1.1.0
+
+module use -a /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
+module load esmf/8.0.0
+
+module load python/3.6.3
+
diff --git a/modulefiles/tasks/wcoss_dell_p3/make_grid.local b/modulefiles/tasks/wcoss_dell_p3/make_grid.local
@@ -0,0 +1,2 @@
+module load lsf/10.1
+module load python/3.6.3
diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh
@@ -372,9 +372,7 @@ 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.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@

		ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427