release of wrf 3.3.1

README

@@ -1,4 +1,4 @@
-WRF Model Version 3.3 (April 6, 2011)
+WRF Model Version 3.3.1 (Sept 16, 2011)
 http://wrf-model.org/users/users.php
 
 ------------------------
@@ -27,6 +27,16 @@ infringement actions.
 This is the main directory for the WRF Version 3 source code release.
 ======================================
 
+V3.3.1 Release Notes (9/16/11) (rev 5130):
+-------------------
+
+This is a bug fix release. The detailed updates for WRF-ARW can be found at
+http://www.mmm.ucar.edu/wrf/users/wrfv3.3/updates-3.3.1.html,
+and for WRF-NMM at
+http://www.dtcenter.org/wrf-nmm/users/model/wrfv3/updates.php
+
+======================================
+
 V3.3 Release Notes:
 -------------------
 

README.DA

@@ -25,7 +25,7 @@ This is the main directory for the WRFDA Version 3 source code release.
 V3.3 Release Notes:
 -----------------------
 
-Version 3.3 is released on April 5, 2011.
+Version 3.3 is released on April 6, 2011.
 
 - RTTOV interfaces has been upgraded to version 10.0
   Please download RTTOV v10.0 and install it in appropriate location 

README.windturbine

@@ -82,4 +82,8 @@ It works with the MYNN PBL and modifies the QKE field representing 2xTKE
 to include the TKE produced by wind turbines. QKE is advected as a part
 of the scalar 4D tracer array in WRF.
 
+Reference: Fitch, A.C., Olson, J.B., Lundquist, J.K., Dudhia, J., Gupta, A.K.,
+Michalakes, J., Barstad, I. Local and Mesoscale Impacts of Wind Farms
+as Parameterized in a Mesoscale NWP Model. Manuscript in preparation. 
+
 

Registry/Registry.NMM

@@ -1209,7 +1209,8 @@ package   temfpblscheme  bl_pbl_physics==10          -             -
 package   kfetascheme    cu_physics==1               -             -
 package   bmjscheme      cu_physics==2               -             -
 package   gdscheme       cu_physics==3               -             -
-package   sasscheme      cu_physics==4               -             -
+package   sasscheme      cu_physics==84              -             -
+package   osasscheme     cu_physics==4               -             -
 package   g3scheme       cu_physics==5               -             -
 package   camzmscheme    cu_physics==7               -             -
 package   tiedtkescheme  cu_physics==6               -             -

Registry/Registry.NMM_CHEM

@@ -1248,7 +1248,8 @@ package   temfpblscheme  bl_pbl_physics==10          -             -
 package   kfetascheme    cu_physics==1               -             -
 package   bmjscheme      cu_physics==2               -             -
 package   gdscheme       cu_physics==3               -             -
-package   sasscheme      cu_physics==4               -             -
+package   sasscheme      cu_physics==84              -             -
+package   osasscheme     cu_physics==4               -             -
 package   g3scheme       cu_physics==5               -             -
 package   tiedtkescheme  cu_physics==6               -             -
 package   camzmscheme    cu_physics==7               -             -

Registry/Registry.NMM_NEST

@@ -1319,7 +1319,8 @@ package   temfpblscheme  bl_pbl_physics==10          -             -
 package   kfetascheme    cu_physics==1               -             -
 package   bmjscheme      cu_physics==2               -             -
 package   gdscheme       cu_physics==3               -             -
-package   sasscheme      cu_physics==4               -             -
+package   sasscheme      cu_physics==84              -             -
+package   osasscheme     cu_physics==4               -             -
 package   g3scheme       cu_physics==5               -             -
 package   camzmscheme    cu_physics==7               -             -
 package   tiedtkescheme  cu_physics==6               -             -

Registry/registry.chem

@@ -234,6 +234,7 @@ state    real  ebu_in_dms         i]jf      ebu_in      1         -        i07
 state    real  ebu_in_oc          i]jf      ebu_in      1         -        i07        "ebu_in_oc"             "EMISSIONS"          "mol km^-2 hr^-1"
 state    real  ebu_in_bc          i]jf      ebu_in      1         -        i07        "ebu_in_bc"             "EMISSIONS"          "mol km^-2 hr^-1"
 state    real  ebu_in_sulf        i]jf      ebu_in      1         -        i07        "ebu_in_sulf"           "EMISSIONS"          "mol km^-2 hr^-1"
+state    real  ebu_in_ash         i]jf      ebu_in      1         -        i07        "ebu_in_ash"            "EMISSIONS"          "mol km^-2 hr^-1"
 # additional arrays for mozcart biomass burning
 state    real  ebu_in_bigalk      i]jf      ebu_in      1         -        i07        "ebu_in_bigalk"     "EMISSIONS"          "mol km^-2 hr^-1"
 state    real  ebu_in_bigene      i]jf      ebu_in      1         -        i07        "ebu_in_bigene"     "EMISSIONS"          "mol km^-2 hr^-1"
@@ -2269,7 +2270,7 @@ package   dust   chem_opt==401              -             chem:dust_1,dust_2,dus
 package   eradm           emiss_opt==2                   -             emis_ant:e_iso,e_so2,e_no,e_co,e_eth,e_hc3,e_hc5,e_hc8,e_xyl,e_ol2,e_olt,e_oli,e_tol,e_csl,e_hcho,e_ald,e_ket,e_ora2,e_nh3
 package   eradmsorg       emiss_opt==3                   -             emis_ant:e_iso,e_so2,e_no,e_no2,e_co,e_eth,e_hc3,e_hc5,e_hc8,e_xyl,e_ol2,e_olt,e_oli,e_tol,e_csl,e_hcho,e_ald,e_ket,e_ora2,e_nh3,e_pm25i,e_pm25j,e_pm_10,e_eci,e_ecj,e_orgi,e_orgj,e_so4i,e_so4j,e_no3i,e_no3j,e_naaj,e_naai,e_orgi_a,e_orgj_a,e_orgi_bb,e_orgj_bb
 package   ecbmz_mosaic    emiss_opt==4                   -             emis_ant:e_iso,e_so2,e_no,e_co,e_eth,e_hc3,e_hc5,e_hc8,e_xyl,e_ol2,e_olt,e_oli,e_tol,e_csl,e_hcho,e_ald,e_ket,e_ora2,e_nh3,e_no2,e_ch3oh,e_c2h5oh,e_pm25i,e_pm25j,e_eci,e_ecj,e_orgi,e_orgj,e_so4i,e_so4j,e_no3i,e_no3j,e_so4c,e_no3c,e_orgc,e_ecc
-package   ecptec          emiss_opt==5                   -             emis_ant:e_iso,e_so2,e_no,e_co,e_eth,e_hc3,e_hc5,e_hc8,e_xyl,e_ol2,e_olt,e_oli,e_tol,e_csl,e_hcho,e_ald,e_ket,e_ora2,e_nh3,e_pm_25,e_pm_10,e_oc,e_sulf,e_bc
+package   ecptec          emiss_opt==5                   -             emis_ant:e_iso,e_so2,e_no,e_no2,e_co,e_eth,e_hc3,e_hc5,e_hc8,e_xyl,e_ol2,e_olt,e_oli,e_tol,e_csl,e_hcho,e_ald,e_ket,e_ora2,e_nh3,e_pm_25,e_pm_10,e_oc,e_sulf,e_bc
 package   gocart_ecptec   emiss_opt==6                   -             emis_ant:e_so2,e_sulf,e_bc,e_oc,e_pm_25,e_pm_10
 package   mozem           emiss_opt==7                   -             emis_ant:e_co,e_no,e_no2,e_bigalk,e_bigene,e_c2h4,e_c2h5oh,e_c2h6,e_c3h6,e_c3h8,e_ch2o,e_ch3cho,e_ch3coch3,e_ch3oh,e_mek,e_so2,e_toluene,e_nh3,e_isop,e_c10h16
 package   mozcem          emiss_opt==8                   -             emis_ant:e_co,e_no,e_no2,e_bigalk,e_bigene,e_c2h4,e_c2h5oh,e_c2h6,e_c3h6,e_c3h8,e_ch2o,e_ch3cho,e_ch3coch3,e_ch3oh,e_mek,e_so2,e_toluene,e_nh3,e_isop,e_c10h16,e_pm_10,e_pm_25,e_bc,e_oc,e_sulf
@@ -2296,8 +2297,8 @@ package   gunther1      bio_emiss_opt==1             -             -
 package   beis313       bio_emiss_opt==2             -             -
 package   megan2        bio_emiss_opt==3             -             state:mebio_isop,mebio_apin,mebio_bcar,mebio_acet,mebio_mbo,mebio_no,msebio_isop,mlai,pftp_bt,pftp_nt,pftp_sb,pftp_hb,mtsa,mswdown,EFmegan
 # the following arrays only needed for burn options
-package   biomassb      biomass_burn_opt==1             -          state:mean_fct_agtf,mean_fct_agef,mean_fct_agsv,mean_fct_aggr,firesize_agtf,firesize_agef,firesize_agsv,firesize_aggr;ebu:ebu_no,ebu_co,ebu_co2,ebu_eth,ebu_hc3,ebu_hc5,ebu_hc8,ebu_ete,ebu_olt,ebu_oli,ebu_pm25,ebu_pm10,ebu_dien,ebu_iso,ebu_api,ebu_lim,ebu_tol,ebu_csl,ebu_hcho,ebu_ald,ebu_ket,ebu_macr,ebu_ora1,ebu_ora2,ebu_so2,ebu_nh3,ebu_oc,ebu_bc,ebu_sulf,ebu_dms;ebu_in:ebu_in_no,ebu_in_co,ebu_in_co2,ebu_in_eth,ebu_in_hc3,ebu_in_hc5,ebu_in_hc8,ebu_in_ete,ebu_in_olt,ebu_in_oli,ebu_in_pm25,ebu_in_pm10,ebu_in_dien,ebu_in_iso,ebu_in_api,ebu_in_lim,ebu_in_tol,ebu_in_csl,ebu_in_hcho,ebu_in_ald,ebu_in_ket,ebu_in_macr,ebu_in_ora1,ebu_in_ora2,ebu_in_so2,ebu_in_nh3,ebu_in_oc,ebu_in_bc,ebu_in_sulf,ebu_in_dms
-package   biomassb_mozc      biomass_burn_opt==2             -          state:mean_fct_agtf,mean_fct_agef,mean_fct_agsv,mean_fct_aggr,firesize_agtf,firesize_agef,firesize_agsv,firesize_aggr;ebu:ebu_co,ebu_no,ebu_bigalk,ebu_bigene,ebu_c2h4,ebu_c2h5oh,ebu_c2h6,ebu_c3h6,ebu_c3h8,ebu_ch2o,ebu_ch3cho,ebu_ch3coch3,ebu_ch3oh,ebu_mek,ebu_so2,ebu_toluene,ebu_nh3,ebu_oc,ebu_bc,ebu_pm25,ebu_pm10,ebu_no2,ebu_open,ebu_c10h16,ebu_mgly,ebu_ch3cooh,ebu_cres,ebu_glyald,ebu_gly,ebu_acetol,ebu_isop,ebu_macr,ebu_mvk;ebu_in:ebu_in_co,ebu_in_no,ebu_in_bigalk,ebu_in_bigene,ebu_in_c2h4,ebu_in_c2h5oh,ebu_in_c2h6,ebu_in_c3h6,ebu_in_c3h8,ebu_in_ch2o,ebu_in_ch3cho,ebu_in_ch3coch3,ebu_in_ch3oh,ebu_in_mek,ebu_in_so2,ebu_in_toluene,ebu_in_nh3,ebu_in_no2,ebu_in_open,ebu_in_c10h16,ebu_in_mgly,ebu_in_ch3cooh,ebu_in_cres,ebu_in_glyald,ebu_in_gly,ebu_in_acetol,ebu_in_isop,ebu_in_macr,ebu_in_mvk,ebu_in_pm25,ebu_in_pm10,ebu_in_oc,ebu_in_bc
+package   biomassb      biomass_burn_opt==1             -          state:mean_fct_agtf,mean_fct_agef,mean_fct_agsv,mean_fct_aggr,firesize_agtf,firesize_agef,firesize_agsv,firesize_aggr;ebu:ebu_no,ebu_no2,ebu_co,ebu_co2,ebu_eth,ebu_hc3,ebu_hc5,ebu_hc8,ebu_ete,ebu_olt,ebu_oli,ebu_pm25,ebu_pm10,ebu_dien,ebu_iso,ebu_api,ebu_lim,ebu_tol,ebu_csl,ebu_hcho,ebu_ald,ebu_ket,ebu_macr,ebu_ora1,ebu_ora2,ebu_so2,ebu_nh3,ebu_oc,ebu_bc,ebu_sulf,ebu_dms;ebu_in:ebu_in_no,ebu_in_co,ebu_in_co2,ebu_in_eth,ebu_in_hc3,ebu_in_hc5,ebu_in_hc8,ebu_in_ete,ebu_in_olt,ebu_in_oli,ebu_in_pm25,ebu_in_pm10,ebu_in_dien,ebu_in_iso,ebu_in_api,ebu_in_lim,ebu_in_tol,ebu_in_csl,ebu_in_hcho,ebu_in_ald,ebu_in_xyl,ebu_in_ket,ebu_in_macr,ebu_in_ora1,ebu_in_ora2,ebu_in_so2,ebu_in_nh3,ebu_in_oc,ebu_in_bc,ebu_in_sulf,ebu_in_dms,ebu_in_ash
+package   biomassb_mozc      biomass_burn_opt==2             -          state:mean_fct_agtf,mean_fct_agef,mean_fct_agsv,mean_fct_aggr,firesize_agtf,firesize_agef,firesize_agsv,firesize_aggr;ebu:ebu_co,ebu_no,ebu_no2,,ebu_bigalk,ebu_bigene,ebu_c2h4,ebu_c2h5oh,ebu_c2h6,ebu_c3h6,ebu_c3h8,ebu_ch2o,ebu_ch3cho,ebu_ch3coch3,ebu_ch3oh,ebu_mek,ebu_so2,ebu_toluene,ebu_nh3,ebu_oc,ebu_bc,ebu_pm25,ebu_pm10,ebu_no2,ebu_open,ebu_c10h16,ebu_mgly,ebu_ch3cooh,ebu_cres,ebu_glyald,ebu_gly,ebu_acetol,ebu_isop,ebu_macr,ebu_mvk;ebu_in:ebu_in_co,ebu_in_no,ebu_in_bigalk,ebu_in_bigene,ebu_in_c2h4,ebu_in_c2h5oh,ebu_in_c2h6,ebu_in_c3h6,ebu_in_c3h8,ebu_in_ch2o,ebu_in_ch3cho,ebu_in_ch3coch3,ebu_in_ch3oh,ebu_in_mek,ebu_in_so2,ebu_in_toluene,ebu_in_nh3,ebu_in_no2,ebu_in_open,ebu_in_c10h16,ebu_in_mgly,ebu_in_ch3cooh,ebu_in_cres,ebu_in_glyald,ebu_in_gly,ebu_in_acetol,ebu_in_isop,ebu_in_macr,ebu_in_mvk,ebu_in_pm25,ebu_in_pm10,ebu_in_oc,ebu_in_bc
 package   opt_out      opt_pars_out==1             -          ext_coef:extcof3,extcof55,extcof106,extcof3_5,extcof8_12;bscat_coef:bscof3,bscof55,bscof106;asym_par:asympar3,asympar55,asympar106
 
 # dust and sea salt packages

Registry/registry.stoch

@@ -4,9 +4,9 @@
 state    real   VERTSTRUCC         ikj dyn_em  1  -  rhd  "VERTSTRUCC    "  "vertical structure for stoch. forcing " ""
 state    real   VERTSTRUCS         ikj dyn_em  1  -  rhd  "VERTSTRUCS    "  "vertical structure for stoch. forcing " ""
 
-state real ru_tendf_stoch     ikjb dyn_em 1 X rhdf=(p2c:dt) "ru_tendf_stoch" "stochastic forcing, U " ""
-state real rv_tendf_stoch     ikjb dyn_em 1 Y rhdf=(p2c:dt) "rv_tendf_stoch" "stochastic forcing, V " ""
-state real rt_tendf_stoch     ikjb dyn_em 1 - rhdf=(p2c:dt) "rt_tendf_stoch" "stochastic forcing, T " ""
+state real ru_tendf_stoch     ikjb dyn_em 1 X rhdf=(p2c:dt) "ru_tendf_stoch" "stochastic forcing, U " "m/s"
+state real rv_tendf_stoch     ikjb dyn_em 1 Y rhdf=(p2c:dt) "rv_tendf_stoch" "stochastic forcing, V " "m/s"
+state real rt_tendf_stoch     ikjb dyn_em 1 - rhdf=(p2c:dt) "rt_tendf_stoch" "stochastic forcing, T " "K/s"
 
 # 2d arrays
 state    real  SPSTREAMFORCC  ij  misc    1  -   r    "SPSTREAMFORCC" "real  spect. coeff. of stoch. streamfunction perturb." ""
@@ -51,10 +51,13 @@ state logical   did_stoch        -      misc        1         -     r         "D
 # Namelist parameters
 rconfig   integer     stoch_force_opt     namelist,physics	max_domains    0   -     "stochastic forcing option: 0=none, 1=backscatter"
 rconfig   integer     stoch_vertstruc_opt namelist,physics	max_domains    0   -     "vertical structure for stochastic forcing: 0=constant, 1=random phase"
-rconfig   integer     nens                namelist,physics      1              1   -     "ensemble member"    ""   ""
-rconfig   real        tot_backscat_psi    namelist,physics      max_domains    115200   -     "total backscattered energy 240*240*2"    "m2 s-3"   ""
-rconfig   real        tot_backscat_t      namelist,physics      max_domains    2.0E-06   - "total backscattered temperature"    "Cp m2 s-3" ""
+rconfig   integer     nens                namelist,physics      1              1   -     "random number seed for ensemble members "    ""   ""
+rconfig   real        tot_backscat_psi    namelist,physics      max_domains    1.7E-05   - "total backscattered dissipation rate for streamfunction m2 s-3"   ""
+rconfig   real        tot_backscat_t      namelist,physics      max_domains    4.6E-05   - "total backscattered dissipation rate for temperature"    "m2 s-3" ""
+
+rconfig   real        stoch_force_global_opt       derived      1              0      h    "stoch_force_global_opt" "global (across domains) stochastic forcing option"  ""
+
 
 # Package declarations
-package   no_stoch_force      stoch_force_opt==0                  -             -
-package   stoch_backscatter   stoch_force_opt==1                  -             state:ru_tendf_stoch,rv_tendf_stoch,rt_tendf_stoch,SPSTREAMFORCC,SPSTREAMFORCS,SPTFORCC,SPTFORCS,SPSTREAM_AMP,SPT_AMP,VERTSTRUCC,VERTSTRUCS,RU_IMAG,RU_REAL_xxx,RU_REAL_yyy,RU_IMAG_xxx,RU_IMAG_yyy,RV_IMAG,RV_REAL_xxx,RV_REAL_yyy,RV_IMAG_xxx,RV_IMAG_yyy,RT_IMAG,RT_REAL_xxx,RT_REAL_yyy,RT_IMAG_xxx,RT_IMAG_yyy,RU_REAL,RV_REAL,RT_REAL
+package   no_stoch_force      stoch_force_global_opt==0                  -             -
+package   stoch_backscatter   stoch_force_global_opt==1                  -             state:ru_tendf_stoch,rv_tendf_stoch,rt_tendf_stoch,SPSTREAMFORCC,SPSTREAMFORCS,SPTFORCC,SPTFORCS,SPSTREAM_AMP,SPT_AMP,VERTSTRUCC,VERTSTRUCS,RU_IMAG,RU_REAL_xxx,RU_REAL_yyy,RU_IMAG_xxx,RU_IMAG_yyy,RV_IMAG,RV_REAL_xxx,RV_REAL_yyy,RV_IMAG_xxx,RV_IMAG_yyy,RT_IMAG,RT_REAL_xxx,RT_REAL_yyy,RT_IMAG_xxx,RT_IMAG_yyy,RU_REAL,RV_REAL,RT_REAL

arch/Config_new.pl

@@ -242,7 +242,10 @@
 
 $validresponse = 0 ;
 
-@platforms = qw ( serial smpar dmpar dm+sm ) ;
+if ( $sw_wrf_core eq "4D_DA_CORE" ) 
+   { @platforms = qw ( serial dmpar ) ; }
+   else
+   { @platforms = qw ( serial smpar dmpar dm+sm ) ; }
 
 # Display the choices to the user and get selection
 until ( $validresponse ) {
@@ -400,9 +403,17 @@
     if ( $sw_esmflib_path && $sw_esmfinc_path )
       {
       $_ =~ s:CONFIGURE_ESMF_FLAG:-DESMFIO:g ;
-      $_ =~ s:ESMFIOLIB:-L$sw_esmflib_path -lesmf -L\$\(WRF_SRC_ROOT_DIR\)/external/io_esmf -lwrfio_esmf \$\(ESMF_LIB_FLAGS\):g ;
-      $_ =~ s:ESMFIOEXTLIB:-L$sw_esmflib_path -lesmf -L\$\(WRF_SRC_ROOT_DIR\)/external/io_esmf -lwrfio_esmf \$\(ESMF_LIB_FLAGS\):g ;
+# pre 5.2.0r
+#      $_ =~ s:ESMFIOLIB:-L$sw_esmflib_path -lesmf -L\$\(WRF_SRC_ROOT_DIR\)/external/io_esmf -lwrfio_esmf \$\(ESMF_LIB_FLAGS\):g ;
+#      $_ =~ s:ESMFIOEXTLIB:-L$sw_esmflib_path -lesmf -L\$\(WRF_SRC_ROOT_DIR\)/external/io_esmf -lwrfio_esmf \$\(ESMF_LIB_FLAGS\):g ;
+# post 5.2.0r
+      $_ =~ s:ESMFIOLIB:\$\(ESMF_F90LINKPATHS\) \$\(ESMF_F90ESMFLINKLIBS\) -L\$\(WRF_SRC_ROOT_DIR\)/external/io_esmf -lwrfio_esmf: ;
+      $_ =~ s:ESMFIOEXTLIB:\$\(ESMF_IO_LIB\): ;
+
+
       $_ =~ s:ESMFLIBFLAG:\$\(ESMF_LDFLAG\):g ;
+#      $_ =~ s:ESMFINCLUDEGOESHERE:'include $(ESMFLIB)/esmf.mk': ;
+
       }
     else
       {
@@ -513,6 +524,10 @@
         if ( $paropt eq 'dmpar' || $paropt eq 'dm+sm' ) { 
           if ( $sw_os ne "CYGWIN_NT" ) {
             $sw_comms_lib = "\$(WRF_SRC_ROOT_DIR)/external/RSL_LITE/librsl_lite.a" ;
+            if ( $sw_wrf_core eq "4D_DA_CORE" )
+            {
+              $sw_comms_lib = "\$(WRFPLUS_DIR)/external/RSL_LITE/librsl_lite.a" ;
+            }
           } else {
             $sw_comms_lib = "../external/RSL_LITE/librsl_lite.a" ;
           }
@@ -552,6 +567,8 @@
     $_ =~ s:ESMFIOINC:-I\$\(WRF_SRC_ROOT_DIR\)/external/io_esmf:g ;
     $_ =~ s:ESMFIODEFS:-DESMFIO:g ;
     $_ =~ s:ESMFTARGET:wrfio_esmf:g ;
+    $_ =~ s:\# ESMFINCLUDEGOESHERE:include \$\(ESMFLIB\)/esmf.mk: ;
+
     }
   else
     {

arch/configure_new.defaults

@@ -973,11 +973,11 @@ OMPCPP		=	# -D_OPENMP
 OMP		=	# -qsmp=noauto
 OMPCC		=	# -qsmp=noauto
 # these have to be the same as DM_FC on surveyor or it fails with weird errors in time manager
-SFC             =       time mpixlf90_r
-SCC             =       time mpixlc_r
-CCOMP           =       time mpixlc_r
-DM_FC           =       time mpixlf90_r
-DM_CC           =       time mpixlc_r -DMPI2_SUPPORT
+SFC             =       mpixlf90_r
+SCC             =       mpixlc_r
+CCOMP           =       mpixlc_r
+DM_FC           =       mpixlf90_r
+DM_CC           =       mpixlc_r -DMPI2_SUPPORT
 FC              =        $(DM_FC)
 CC              =       $(DM_CC) -DFSEEKO64_OK
 LD              =       $(FC)

arch/postamble_new

@@ -29,6 +29,7 @@ CFLAGS          =    $(CFLAGS_LOCAL) CONFIGURE_DMPARALLEL CONFIGURE_STUBMPI \
                       -DMAX_HISTORY=$(MAX_HISTORY)
 FCFLAGS         =    $(FCOPTIM) $(FCBASEOPTS)
 ESMF_LIB_FLAGS  =    ESMFLIBFLAG
+# ESMF 5 -- these are defined in esmf.mk, included above
 #NOWIN ESMF_IO_LIB     =    ESMFIOLIB
 ESMF_IO_LIB_EXT =    ESMFIOEXTLIB
 INCLUDE_MODULES =    $(MODULE_SRCH_FLAG) \

arch/preamble_new

@@ -81,6 +81,9 @@ ESMF_IO_DEFS        = ESMFIODEFS
 # select build target for external/io_esmf vs. external/esmf_time_f90
 ESMF_TARGET         = ESMFTARGET
 
+# ESMFINCLUDEGOESHERE
+
+
 ##############################################################################
 
 LIBWRFLIB = libwrflib.a

compile

@@ -258,7 +258,7 @@ else
        setenv CRTM_LIB "-L../external/crtm/libsrc -lCRTM"
        setenv CRTM_SRC "-I../external/crtm/libsrc"
        setenv SFC_CRTM `grep '^SFC' configure.wrf | awk '{print $3}' | sed -e 's/\// /g' | awk '{print $NF}'`
-       setenv ABI_CRTM `grep '^SFC' configure.wrf | grep -o -E "\-m[0-9]{2}"`
+       setenv ABI_CRTM `grep '^SFC' configure.wrf | sed -n 's/.*\(\-m[0-9]\{2\}\).*/\1/p'`
     else
        setenv CRTM_CPP " "
        setenv CRTM_LIB " "
@@ -316,9 +316,15 @@ else
     endif
     if ( $overwrite ) then
       if (($WRF_NMM_CORE == 1)&&($WRF_NMM_NEST == 1)) then
-        echo copying Registry/Registry.NMM_NEST to Registry/Registry
-        echo '## WARNING: this file is autogenerated from Registry/Registry.NMM_NEST. Changes may be lost' > Registry/Registry
-        /bin/cat Registry/Registry.NMM_NEST >> Registry/Registry
+        if ($HWRF == 1) then
+          echo copying Registry/Registry.NMM_HWRF to Registry/Registry
+          echo '## WARNING: this file is autogenerated from Registry/Registry.NMM_HWRF. Changes may be lost' > Registry/Registry
+          /bin/cat Registry/Registry.NMM_HWRF >> Registry/Registry
+        else
+          echo copying Registry/Registry.NMM_NEST to Registry/Registry
+          echo '## WARNING: this file is autogenerated from Registry/Registry.NMM_NEST. Changes may be lost' > Registry/Registry
+          /bin/cat Registry/Registry.NMM_NEST >> Registry/Registry
+        endif 
       else
         echo copying Registry/Registry.NMM to Registry/Registry
         echo '## WARNING: this file is autogenerated from Registry/Registry.NMM. Changes may be lost' > Registry/Registry