diff --git a/arch/Config_new.pl b/arch/Config.pl similarity index 98% rename from arch/Config_new.pl rename to arch/Config.pl index c00751e42b..d196fe5993 100644 --- a/arch/Config_new.pl +++ b/arch/Config.pl @@ -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 @@ -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 ( ) { $currline = $_; @@ -453,7 +453,7 @@ $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 ( ) { @@ -461,9 +461,9 @@ { 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 ; @@ -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 ; @@ -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 ( ) diff --git a/arch/configure_new.defaults b/arch/configure.defaults similarity index 100% rename from arch/configure_new.defaults rename to arch/configure.defaults diff --git a/arch/postamble_new b/arch/postamble similarity index 100% rename from arch/postamble_new rename to arch/postamble diff --git a/arch/preamble_new b/arch/preamble similarity index 98% rename from arch/preamble_new rename to arch/preamble index f49471805a..819b433c2b 100644 --- a/arch/preamble_new +++ b/arch/preamble @@ -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` diff --git a/compile b/compile index 3f22e1a208..13c440a158 100755 --- a/compile +++ b/compile @@ -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 diff --git a/configure b/configure index fa181b3ea0..9ecafc7c10 100755 --- a/configure +++ b/configure @@ -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 @@ -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 @@ -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" \ @@ -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 @@ -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