add submodule

Author: peverwhee

.gitmodules

@@ -12,13 +12,6 @@
         fxtag = carma4_09
         fxDONOTUSEurl = https://github.com/ESCOMP/CARMA_base.git
 
-[submodule "pumas"]
-	path = src/physics/pumas
-	url = https://github.com/ESCOMP/PUMAS
-        fxrequired = AlwaysRequired
-        fxtag = pumas_cam-release_v1.39
-        fxDONOTUSEurl = https://github.com/ESCOMP/PUMAS
-
 [submodule "pumas-frozen"]
 	path = src/physics/pumas-frozen
 	url = https://github.com/ESCOMP/PUMAS

bld/build-namelist

@@ -739,7 +739,7 @@ elsif ($rad_pkg =~ m/rrtmgp/) {
     my $abs_path = quote_string(set_abs_filepath($rel_path, $cam_dir));
     $nl->set_variable_value('radiation_nl', 'rrtmgp_coefs_sw_file', $abs_path);
 
-    add_default($nl, 'p_top_for_rrtmgp');
+    add_default($nl, 'p_top_for_equil_rad');
 
 }
 
@@ -3339,7 +3339,7 @@ if ($cfg->get('microphys') =~ /^mg/) {
 	add_default($nl, 'micro_mg_accre_sees_auto');
 	add_default($nl, 'micro_mg_vtrms_factor');
 	add_default($nl, 'micro_mg_implicit_fall');
-        add_default($nl, 'pumas_stochastic_tau_kernel_filename', 'val'=>"$cfgdir/../src/physics/pumas/KBARF_tau_kernel.dat");
+        add_default($nl, 'pumas_stochastic_tau_kernel_filename', 'val'=>"$cfgdir/../src/atmos_phys/schemes/pumas/pumas/KBARF_tau_kernel.dat");
 
         #set path for stochastic_tau_kernel_filename
         my $cam_dir = $cfg->get('cam_dir');

bld/configure

@@ -2161,7 +2161,7 @@ sub write_filepath
     }
 
     if ($phys_pkg eq 'cam7') {
-	print $fh "$camsrcdir/src/physics/pumas\n";
+	print $fh "$camsrcdir/src/atmos_phys/schemes/pumas/pumas\n";
     } else {
 	print $fh "$camsrcdir/src/physics/pumas-frozen\n";
     }

bld/namelist_files/namelist_defaults_cam.xml

@@ -575,9 +575,11 @@
 <rrtmgp_coefs_lw_file>src/physics/rrtmgp/data/rrtmgp-gas-lw-g128.nc</rrtmgp_coefs_lw_file>
 <rrtmgp_coefs_sw_file>src/physics/rrtmgp/data/rrtmgp-gas-sw-g112.nc</rrtmgp_coefs_sw_file>
 
-<p_top_for_rrtmgp>                 10.D0 </p_top_for_rrtmgp>
-<p_top_for_rrtmgp  waccmx="1" >     1.D0 </p_top_for_rrtmgp>
-<p_top_for_rrtmgp  waccm_phys="1" > 1.D0 </p_top_for_rrtmgp>
+<!-- Pressure top for blending region for radiation heating -->
+<p_top_for_equil_rad>                  0.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  waccmx="1" >     1.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  waccm_phys="1" > 1.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  rad="rrtmgp">    2.D0 </p_top_for_equil_rad>
 
 <!-- CAM-RT absorptivity/emissivity lookup table -->
 <absems_data rad="camrt">atm/cam/rad/abs_ems_factors_fastvx.c030508.nc</absems_data>

bld/namelist_files/namelist_definition.xml

@@ -5771,11 +5771,12 @@ Calculate radiative effect of graupel/hail (using snow optics)
 Default: FALSE
 </entry>
 
-<entry id="p_top_for_rrtmgp" type="real"  category="radiation"
-       group="radiation_nl" valid_values="" >
-Top pressure level for RRTMGP
+<entry id="p_top_for_equil_rad" type="real"  category="radiation"
+       group="radheat_nl" valid_values="" >
+Top pressure level for non-LTE blending region
 Default: 1.0 for WACCM/WACCMX
-         10. for all other CAM runs
+         2. for all other RRTMGP runs
+         0.0 for all other runs
 </entry>
 
 <entry id="use_rad_dt_cosz" type="logical"  category="radiation"

doc/ChangeLog

@@ -460,7 +460,7 @@ subroutine aero_convproc_intr( aero_props, aero_state, state, ptend, pbuf, ztodt
 
             ndx = aer_cnst_ndx(mm)
 
-            if (ndx>0) call outfld( trim(cnst_name_extd(1,mm))//'SFWET', aerdepwetis(:,ndx), pcols, lchnk )
+            if (ndx>0) call outfld( trim(cnst_name_extd(1,mm))//'SFWETC', aerdepwetis(:,ndx), pcols, lchnk )
             call outfld( trim(cnst_name_extd(1,mm))//'SFSIC', sflxic(:,mm), pcols, lchnk )
             call outfld( trim(cnst_name_extd(1,mm))//'SFSEC', sflxec(:,mm), pcols, lchnk )
 

src/chemistry/aerosol/aero_convproc.F90

@@ -268,6 +268,8 @@ subroutine add_hist_fields(name,baseunits)
 
       call addfld (trim(name)//'SFWET', &
            horiz_only,  'A',baseunits//'/m2/s ','Wet deposition flux at surface')
+      call addfld (trim(name)//'SFWETC', &
+           horiz_only,  'A',baseunits//'/m2/s ','Wet deposition flux (convective) at surface')
       call addfld (trim(name)//'SFSIC', &
            horiz_only,  'A',baseunits//'/m2/s ','Wet deposition flux (incloud, convective) at surface')
       call addfld (trim(name)//'SFSIS', &
@@ -666,8 +668,8 @@ subroutine aero_wetdep_tend( state, dt, dlf, cam_out, ptend, pbuf)
                 call outfld( trim(name)//'SFWET', sflx, pcols, lchnk)
                 if (ndx>0) aerdepwetcw(:ncol,ndx) = sflx(:ncol)
              else
-                if (.not.convproc_do_aer) call outfld( trim(name)//'SFWET', sflx, pcols, lchnk)
                 if (ndx>0) aerdepwetis(:ncol,ndx) = aerdepwetis(:ncol,ndx) + sflx(:ncol)
+                call outfld( trim(name)//'SFWET', aerdepwetis(:ncol,ndx), ncol, lchnk)
              end if
 
              sflx(:)=0._r8