Skip to content

Commit

Permalink
Update regional_workflow for use with authoritative UFS_UTILS utiliti…
Browse files Browse the repository at this point in the history
…es and add support for global/regional grib2 functionality in chgres_cube (NOAA-EMC#274)

* 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 b04ad0b3c8c554f664c6790030a4f33b5a395023.

* Add HALO_BLEND back into config_defaults.sh

* Set do_deep=false for RRFS_v1beta and other RAP/HRRR suites

* Fix if statement for lsoil variable in generate step.

* Remove link to fixed file in UFS_UTILS source code directory, now points to FIXgsm

* Typo in config_defaults.sh and remove unused SDFs from the make_ics/lbcs scripts, from Gerard's PR

* Add FV3_CPT_v0 to list of SDFs that use the GFS varmap table

* Remove wgrib2 module load from local make_ics/lbcs files

* Use correct system calls for setting up Cheyenne python environment now that these are proper modulefiles

Co-authored-by: Michael Kavulich, Jr <[email protected]>
  • Loading branch information
JeffBeck-NOAA and mkavulich authored Sep 22, 2020
1 parent 5acd351 commit 1857677
Show file tree
Hide file tree
Showing 79 changed files with 478 additions and 6,748 deletions.
11 changes: 0 additions & 11 deletions jobs/JREGIONAL_MAKE_ICS
Original file line number Diff line number Diff line change
Expand Up @@ -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).
#
Expand All @@ -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."
Expand Down
11 changes: 0 additions & 11 deletions jobs/JREGIONAL_MAKE_LBCS
Original file line number Diff line number Diff line change
Expand Up @@ -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).
#
Expand All @@ -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."
Expand Down
10 changes: 0 additions & 10 deletions modulefiles/codes/cheyenne/global_equiv_resol

This file was deleted.

10 changes: 0 additions & 10 deletions modulefiles/codes/cheyenne/mosaic_file

This file was deleted.

10 changes: 0 additions & 10 deletions modulefiles/codes/cheyenne/regional_grid

This file was deleted.

7 changes: 0 additions & 7 deletions modulefiles/codes/hera/global_equiv_resol

This file was deleted.

7 changes: 0 additions & 7 deletions modulefiles/codes/hera/mosaic_file

This file was deleted.

7 changes: 0 additions & 7 deletions modulefiles/codes/hera/regional_grid

This file was deleted.

7 changes: 0 additions & 7 deletions modulefiles/codes/jet/global_equiv_resol

This file was deleted.

7 changes: 0 additions & 7 deletions modulefiles/codes/jet/mosaic_file

This file was deleted.

8 changes: 0 additions & 8 deletions modulefiles/codes/jet/regional_grid

This file was deleted.

13 changes: 0 additions & 13 deletions modulefiles/codes/odin/global_equiv_resol

This file was deleted.

13 changes: 0 additions & 13 deletions modulefiles/codes/odin/mosaic_file

This file was deleted.

11 changes: 0 additions & 11 deletions modulefiles/codes/odin/regional_grid

This file was deleted.

10 changes: 0 additions & 10 deletions modulefiles/codes/stampede/global_equiv_resol

This file was deleted.

12 changes: 0 additions & 12 deletions modulefiles/codes/stampede/mosaic_file

This file was deleted.

10 changes: 0 additions & 10 deletions modulefiles/codes/stampede/regional_grid

This file was deleted.

15 changes: 0 additions & 15 deletions modulefiles/tasks/cheyenne/make_grid

This file was deleted.

9 changes: 9 additions & 0 deletions modulefiles/tasks/cheyenne/make_grid.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

if [module-info mode load] {
system "ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427"
}

if [module-info mode remove] {
system "deactivate"
}

9 changes: 8 additions & 1 deletion modulefiles/tasks/cheyenne/make_ics.local
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@

ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427
if [module-info mode load] {
system "ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427"
}

if [module-info mode remove] {
system "deactivate"
}

9 changes: 8 additions & 1 deletion modulefiles/tasks/cheyenne/make_lbcs.local
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@

ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427
if [module-info mode load] {
system "ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427"
}

if [module-info mode remove] {
system "deactivate"
}

9 changes: 8 additions & 1 deletion modulefiles/tasks/cheyenne/run_fcst.local
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@

system "ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427"
if [module-info mode load] {
system "ncar_pylib /glade/p/ral/jntp/UFS_CAM/ncar_pylib_20200427"
}

if [module-info mode remove] {
system "deactivate"
}

15 changes: 0 additions & 15 deletions modulefiles/tasks/hera/make_grid

This file was deleted.

6 changes: 6 additions & 0 deletions modulefiles/tasks/hera/make_grid.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

module use -a /contrib/miniconda3/modulefiles
module load miniconda3
if [module-info mode load] {
system "conda activate regional_workflow"
}
5 changes: 3 additions & 2 deletions modulefiles/tasks/hera/make_ics.local
Original file line number Diff line number Diff line change
@@ -1,5 +1,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"
}
5 changes: 3 additions & 2 deletions modulefiles/tasks/hera/make_lbcs.local
Original file line number Diff line number Diff line change
@@ -1,5 +1,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"
}
15 changes: 0 additions & 15 deletions modulefiles/tasks/jet/make_grid

This file was deleted.

6 changes: 6 additions & 0 deletions modulefiles/tasks/jet/make_grid.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

module use -a /contrib/miniconda3/modulefiles
module load miniconda3
if [module-info mode load] {
system "conda activate regional_workflow"
}
4 changes: 3 additions & 1 deletion modulefiles/tasks/jet/make_ics.local
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 3 additions & 1 deletion modulefiles/tasks/jet/make_lbcs.local
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
14 changes: 0 additions & 14 deletions modulefiles/tasks/odin/make_grid

This file was deleted.

11 changes: 0 additions & 11 deletions modulefiles/tasks/stampede/make_grid

This file was deleted.

Loading

0 comments on commit 1857677

Please sign in to comment.