Skip to content

Commit 89f559c

Browse files
committed
Merge branch 'release-v4.3'
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
2 parents b98f858 + cf1e95b commit 89f559c

File tree

15 files changed

+2557
-326
lines changed

15 files changed

+2557
-326
lines changed

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
WRF Pre-Processing System Version 4.2
1+
WRF Pre-Processing System Version 4.3
22

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

configure

Lines changed: 57 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
#!/bin/sh
22

3-
arg1=$1
3+
#
4+
# Check for command-line arguments
5+
# At present, the only supported argument is --nowrf, which disables checks to
6+
# find the path to the compiled WRF model.
7+
#
8+
nowrf=0
9+
for arg in $@; do
10+
if [ "${arg}" = "--nowrf" ]; then
11+
nowrf=1
12+
fi
13+
done
14+
415

516
# Look for netcdf
617
if test -z "$NETCDF" ; then
@@ -153,40 +164,56 @@ fi
153164
wrf_dir="none"
154165
standard_wrf_dirs="WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3"
155166

156-
#
157-
# If no WRF_DIR environment variable is set, try to locate a WRF build in one
158-
# of the expected directory names one directory level up; otherwise, try to use
159-
# the WRF I/O library from the code in $WRF_DIR
160-
#
161-
if [ -z "$WRF_DIR" ]; then
162-
# for d in WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3; do
163-
for d in ${standard_wrf_dirs}; do
164-
if [ -e ../${d}/external/io_netcdf/libwrfio_nf.a ]; then
165-
echo "Found what looks like a valid WRF I/O library in ../${d}"
166-
wrf_dir="../${d}"
167-
break
167+
if [ ${nowrf} -eq 0 ]; then
168+
#
169+
# If no WRF_DIR environment variable is set, try to locate a WRF build in one
170+
# of the expected directory names one directory level up; otherwise, try to use
171+
# the WRF I/O library from the code in $WRF_DIR
172+
#
173+
if [ -z "$WRF_DIR" ]; then
174+
# for d in WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3; do
175+
for d in ${standard_wrf_dirs}; do
176+
if [ -e ../${d}/external/io_netcdf/libwrfio_nf.a ]; then
177+
echo "Found what looks like a valid WRF I/O library in ../${d}"
178+
wrf_dir="../${d}"
179+
break
180+
fi
181+
done
182+
else
183+
if [ ! -e ${WRF_DIR}/external/io_netcdf/libwrfio_nf.a ]; then
184+
echo ""
185+
echo "Error: The \$WRF_DIR environment variable was set, but the WRF code at"
186+
echo " ${WRF_DIR} doesn't appear to have been successfully compiled"
187+
echo ""
188+
exit
168189
fi
169-
done
170-
else
171-
if [ ! -e ${WRF_DIR}/external/io_netcdf/libwrfio_nf.a ]; then
190+
191+
echo "Using WRF I/O library in WRF build identified by \$WRF_DIR: ${WRF_DIR}"
192+
wrf_dir=$WRF_DIR
193+
fi
194+
195+
if [ $wrf_dir = "none" ]; then
172196
echo ""
173-
echo "Error: The \$WRF_DIR environment variable was set, but the WRF code at"
174-
echo " ${WRF_DIR} doesn't appear to have been successfully compiled"
197+
echo "Error: No compiled WRF code found. Please check that the WRF model has been compiled"
198+
echo " one directory level up (i.e., ../) in a directory named 'WRF', 'WRF-4.0.3', 'WRF-4.0.2', etc.,"
199+
echo " or specify the full path to the compiled WRF model with the environment variable \$WRF_DIR ."
200+
echo ""
201+
echo "Alternatively, if only WPS components that do no depend on WRF I/O libraries are needed, re-run"
202+
echo "the configure script with the --nowrf option."
175203
echo ""
176204
exit
177205
fi
178-
179-
echo "Using WRF I/O library in WRF build identified by \$WRF_DIR: ${WRF_DIR}"
180-
wrf_dir=$WRF_DIR
181-
fi
182-
183-
if [ $wrf_dir = "none" ]; then
184-
echo ""
185-
echo "Error: No compiled WRF code found. Please check that the WRF model has been compiled"
186-
echo " one directory level up (i.e., ../) in a directory named 'WRF', 'WRF-4.0.3', 'WRF-4.0.2', etc.,"
187-
echo " or specify the full path to the compiled WRF model with the environment variable \$WRF_DIR ."
188-
echo ""
189-
exit
206+
else
207+
cat << EOF
208+
********************************************************************************
209+
Configuring the WPS without a compiled WRF model.
210+
It will not be possible to build the following WPS components, which depend on
211+
the WRF I/O libraries:
212+
- geogrid
213+
- metgrid
214+
- int2nc
215+
********************************************************************************
216+
EOF
190217
fi
191218

192219
# Found perl, so proceed with configuration

0 commit comments

Comments
 (0)