Skip to content

Commit

Permalink
Merge branch 'release-v4.3'
Browse files Browse the repository at this point in the history
This merge finalizes the v4.3 release by adding changes from the 'release-v4.3'
branch onto the 'master' branch.

* release-v4.3:
  Updated namelist.wps for consistency with updates to namelist.input
  Update version number to 4.3
  add new GWD fields to NoahMP, Chem and Fire tables
  correct default resolution data for OL3SS
  Add --nowrf option to configure script, for configuring without WRF
  Changes to rrpr.F for the September 2020 update to GEFS.
  updated namelist values to match case updates for default namelist.input
  Add 20 new GWD fields for WRF gwd_opt = 3
  update GEOGRID tables for NoahMP, fire and chem
  remove tile drainage
  dynamic irrigation added GEOGRID.TBL.ARW.noahmp
  Fix URL for NARR static data grib1 data
  Update geth_newdate.F
  Update build_hdate.F
  Fix plotfmt.ncl for use with Lambert Conformal projections
  • Loading branch information
mgduda committed May 11, 2021
2 parents b98f858 + cf1e95b commit 89f559c
Show file tree
Hide file tree
Showing 15 changed files with 2,557 additions and 326 deletions.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WRF Pre-Processing System Version 4.2
WRF Pre-Processing System Version 4.3

http://www2.mmm.ucar.edu/wrf/users/

Expand Down
87 changes: 57 additions & 30 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
#!/bin/sh

arg1=$1
#
# Check for command-line arguments
# At present, the only supported argument is --nowrf, which disables checks to
# find the path to the compiled WRF model.
#
nowrf=0
for arg in $@; do
if [ "${arg}" = "--nowrf" ]; then
nowrf=1
fi
done


# Look for netcdf
if test -z "$NETCDF" ; then
Expand Down Expand Up @@ -153,40 +164,56 @@ fi
wrf_dir="none"
standard_wrf_dirs="WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3"

#
# If no WRF_DIR environment variable is set, try to locate a WRF build in one
# of the expected directory names one directory level up; otherwise, try to use
# the WRF I/O library from the code in $WRF_DIR
#
if [ -z "$WRF_DIR" ]; then
# for d in WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3; do
for d in ${standard_wrf_dirs}; do
if [ -e ../${d}/external/io_netcdf/libwrfio_nf.a ]; then
echo "Found what looks like a valid WRF I/O library in ../${d}"
wrf_dir="../${d}"
break
if [ ${nowrf} -eq 0 ]; then
#
# If no WRF_DIR environment variable is set, try to locate a WRF build in one
# of the expected directory names one directory level up; otherwise, try to use
# the WRF I/O library from the code in $WRF_DIR
#
if [ -z "$WRF_DIR" ]; then
# for d in WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3; do
for d in ${standard_wrf_dirs}; do
if [ -e ../${d}/external/io_netcdf/libwrfio_nf.a ]; then
echo "Found what looks like a valid WRF I/O library in ../${d}"
wrf_dir="../${d}"
break
fi
done
else
if [ ! -e ${WRF_DIR}/external/io_netcdf/libwrfio_nf.a ]; then
echo ""
echo "Error: The \$WRF_DIR environment variable was set, but the WRF code at"
echo " ${WRF_DIR} doesn't appear to have been successfully compiled"
echo ""
exit
fi
done
else
if [ ! -e ${WRF_DIR}/external/io_netcdf/libwrfio_nf.a ]; then

echo "Using WRF I/O library in WRF build identified by \$WRF_DIR: ${WRF_DIR}"
wrf_dir=$WRF_DIR
fi

if [ $wrf_dir = "none" ]; then
echo ""
echo "Error: The \$WRF_DIR environment variable was set, but the WRF code at"
echo " ${WRF_DIR} doesn't appear to have been successfully compiled"
echo "Error: No compiled WRF code found. Please check that the WRF model has been compiled"
echo " one directory level up (i.e., ../) in a directory named 'WRF', 'WRF-4.0.3', 'WRF-4.0.2', etc.,"
echo " or specify the full path to the compiled WRF model with the environment variable \$WRF_DIR ."
echo ""
echo "Alternatively, if only WPS components that do no depend on WRF I/O libraries are needed, re-run"
echo "the configure script with the --nowrf option."
echo ""
exit
fi

echo "Using WRF I/O library in WRF build identified by \$WRF_DIR: ${WRF_DIR}"
wrf_dir=$WRF_DIR
fi

if [ $wrf_dir = "none" ]; then
echo ""
echo "Error: No compiled WRF code found. Please check that the WRF model has been compiled"
echo " one directory level up (i.e., ../) in a directory named 'WRF', 'WRF-4.0.3', 'WRF-4.0.2', etc.,"
echo " or specify the full path to the compiled WRF model with the environment variable \$WRF_DIR ."
echo ""
exit
else
cat << EOF
********************************************************************************
Configuring the WPS without a compiled WRF model.
It will not be possible to build the following WPS components, which depend on
the WRF I/O libraries:
- geogrid
- metgrid
- int2nc
********************************************************************************
EOF
fi

# Found perl, so proceed with configuration
Expand Down
Loading

0 comments on commit 89f559c

Please sign in to comment.