Skip to content

Remove the "_new" string from the arch dir file names, and the associated file references #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davegill merged 5 commits into from
May 10, 2018
Merged

Remove the "_new" string from the arch dir file names, and the associated file references #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cebbde5
With v4.0, remove all of the "_new" stuff in the arch dir from 10 yea…
davegill May 10, 2018
463dc08
Remove the _new from names inside of configure and Config.pl
davegill May 10, 2018
10806a0
Missed a couple of _new in configure
davegill May 10, 2018
00a8410
... and _new is also in compile, gee
davegill May 10, 2018
db89220
Remove stray echo about configure_new.defaults
davegill May 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions arch/Config_new.pl → arch/Config.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
{
if ( $ENV{JASPERLIB} && $ENV{JASPERINC} )
{
printf "\n\nIf you REALLY want Grib2 output from WRF, modify the arch/Config_new.pl script.\n" ;
printf "\n\nIf you REALLY want Grib2 output from WRF, modify the arch/Config.pl script.\n" ;
printf "Right now you are not getting the Jasper lib, from the environment, compiled into WRF.\n\n" ;
}
else
Expand Down Expand Up @@ -369,8 +369,8 @@

$opt = 1 ;
$optstr = "";
open CONFIGURE_DEFAULTS, "< ./arch/configure_new.defaults"
or die "Cannot open ./arch/configure_new.defaults for reading" ;
open CONFIGURE_DEFAULTS, "< ./arch/configure.defaults"
or die "Cannot open ./arch/configure.defaults for reading" ;
while ( <CONFIGURE_DEFAULTS> ) {

$currline = $_;
Expand Down Expand Up @@ -453,17 +453,17 @@
$sw_terrain_and_landuse =" -DTERRAIN_AND_LANDUSE" ;
}
}
open CONFIGURE_DEFAULTS, "cat ./arch/configure_new.defaults |" ;
open CONFIGURE_DEFAULTS, "cat ./arch/configure.defaults |" ;
$latchon = 0 ;
while ( <CONFIGURE_DEFAULTS> )
{
if ( substr( $_, 0, 5 ) eq "#ARCH" && $latchon == 1 )
{
close CONFIGURE_DEFAULTS ;
if ( $sw_opt_level eq "-f" ) {
open CONFIGURE_DEFAULTS, "cat ./arch/postamble_new ./arch/noopt_exceptions_f |" or die "horribly" ;
open CONFIGURE_DEFAULTS, "cat ./arch/postamble ./arch/noopt_exceptions_f |" or die "horribly" ;
} else {
open CONFIGURE_DEFAULTS, "cat ./arch/postamble_new ./arch/noopt_exceptions |" or die "horribly" ;
open CONFIGURE_DEFAULTS, "cat ./arch/postamble ./arch/noopt_exceptions |" or die "horribly" ;
}
}
$_ =~ s:CONFIGURE_NMM_CORE:$sw_nmm_core:g ;
Expand Down Expand Up @@ -657,7 +657,7 @@
&& ( index( $_, $sw_os ) >= 0 ) && ( index( $_, $sw_mach ) >= 0 )
&& ( index($_, $paropt) >= 0 ) )
{
# We are cycling through the configure_new.defaults file again.
# We are cycling through the configure.defaults file again.
# This bit tries to match the line corresponding to the option we previously selected.
$x=substr($_,6) ;
$x =~ s/#.*$//g ;
Expand Down Expand Up @@ -779,7 +779,7 @@
close ARCH_NOOPT_EXCEPTIONS ;

open CONFIGURE_WRF, "> configure.wrf" or die "cannot append configure.wrf" ;
open ARCH_PREAMBLE, "< arch/preamble_new" or die "cannot open arch/preamble_new" ;
open ARCH_PREAMBLE, "< arch/preamble" or die "cannot open arch/preamble" ;
my @preamble;
# apply substitutions to the preamble...
while ( <ARCH_PREAMBLE> )
Expand Down
0 arch/configure_new.defaults → arch/configure.defaults
View file
Open in desktop
File renamed without changes.
0 arch/postamble_new → arch/postamble
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion arch/preamble_new → arch/preamble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# first installed.
#
# To permanently change options, change the settings for your platform
# in the file arch/configure_new.defaults then rerun configure.
# in the file arch/configure.defaults then rerun configure.
#
SHELL = /bin/sh
DEVTOP = `pwd`
Expand Down
6 changes: 3 additions & 3 deletions compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,12 @@ else
/bin/cat Registry/Registry.NMM >> Registry/Registry
endif
# integrity check for a kludge where a hard coded value in the
# registry must match the same value in arch/preamble_new
# registry must match the same value in arch/preamble
set registryvalue=`grep 'dimspec.* q ' Registry/registry.dimspec | sed -e 's/..*constant=//' -e 's/ ..*$//'`
set preamblevalue=`grep 'DNMM_MAX_DIM=.*' arch/preamble_new | sed -e 's/..*-DNMM_MAX_DIM=//' -e 's/ ..*$//'`
set preamblevalue=`grep 'DNMM_MAX_DIM=.*' arch/preamble | sed -e 's/..*-DNMM_MAX_DIM=//' -e 's/ ..*$//'`
if ( $registryvalue != $preamblevalue ) then
echo "Harded coded value of dimspec q in Registry ($registryvalue) does not"
echo "equal the hard coded value of NMM_MAX_DIM in arch/preamble_new ($preamblevalue)"
echo "equal the hard coded value of NMM_MAX_DIM in arch/preamble ($preamblevalue)"
echo "Please fix and try again."
exit 2
endif
Expand Down
12 changes: 6 additions & 6 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ if [ "$os" = "AIX" ] ; then
fi

# compile options that come from the environment, such as chemistry
# the "!" is removed by Config_new.pl
# the "!" is removed by Config.pl
if [ -n "$WRF_HYDRO" ] ; then
if [ $WRF_HYDRO = 1 ] ; then
echo building WRF-HYDRO
Expand All @@ -393,7 +393,7 @@ if [ -n "$WRF_HYDRO" ] ; then
fi

# compile options that come from the environment, such as chemistry
# the "!" is removed by Config_new.pl
# the "!" is removed by Config.pl
if [ -n "$WRF_MARS" ] ; then
if [ $WRF_MARS = 1 ] ; then
echo building WRF for Mars
Expand Down Expand Up @@ -514,9 +514,9 @@ fi

# Found perl, so proceed with configuration
if test -n "$PERL" ; then
srch=`grep -i "^#ARCH.*$os" arch/configure_new.defaults | grep -i "$mach"`
srch=`grep -i "^#ARCH.*$os" arch/configure.defaults | grep -i "$mach"`
if [ -n "$srch" ] ; then
$PERL arch/Config_new.pl -dmparallel=$COMMLIB -ompparallel=$OMP -perl=$PERL \
$PERL arch/Config.pl -dmparallel=$COMMLIB -ompparallel=$OMP -perl=$PERL \
-netcdf=$NETCDF -pnetcdf=$PNETCDF -hdf5=$HDF5 -phdf5=$PHDF5 -os=$os -mach=$mach -ldflags=$ldflags \
-compileflags=$compileflags -opt_level=$opt_level -USENETCDFF=$USENETCDFF -USENETCDF=$USENETCDF \
-time=$FORTRAN_COMPILER_TIMER -tfl="$TFL" -cfl="$CFL" -config_line="$config_line" \
Expand Down Expand Up @@ -549,7 +549,7 @@ if test -n "$PERL" ; then
echo '*********************************************************'
echo '*** ERROR ERROR ERROR ERROR ***'
echo '*** ***'
echo '*** Configuration not found in configure_new.defaults ***'
echo '*** Configuration not found in configure.defaults ***'
echo '*********************************************************'
exit 2
fi
Expand Down Expand Up @@ -595,7 +595,7 @@ echo "------------------------------------------------------------------------"
echo "Settings listed above are written to configure.wrf."
echo "If you wish to change settings, please edit that file."
echo "If you wish to change the default options, edit the file:"
echo " arch/configure_new.defaults"
echo " arch/configure.defaults"

if test -n "$NETCDF" ; then
if [ ! -f $NETCDF/include/netcdf.inc ] ; then
Expand Down