Restructure ozone luna

bld/CLMBuildNamelist.pm

@@ -1494,6 +1494,7 @@ sub process_namelist_inline_logic {
   setup_logic_glacier($opts, $nl_flags, $definition, $defaults, $nl,  $envxml_ref);
   setup_logic_dynamic_plant_nitrogen_alloc($opts, $nl_flags, $definition, $defaults, $nl, $physv);
   setup_logic_luna($opts, $nl_flags, $definition, $defaults, $nl, $physv);
+  setup_logic_o3_veg_stress_method($opts, $nl_flags, $definition, $defaults, $nl,$physv);
   setup_logic_hydrstress($opts,  $nl_flags, $definition, $defaults, $nl);
   setup_logic_dynamic_roots($opts,  $nl_flags, $definition, $defaults, $nl, $physv);
   setup_logic_params_file($opts,  $nl_flags, $definition, $defaults, $nl);
@@ -3033,6 +3034,26 @@ sub setup_logic_dynamic_plant_nitrogen_alloc {
 
 #-------------------------------------------------------------------------------
 
+sub setup_logic_o3_veg_stress_method {
+  #
+  # Ozone vegetation stress method 
+  #
+  my ($opts, $nl_flags, $definition, $defaults, $nl, $physv) = @_;
+
+  my $var = 'o3_veg_stress_method';
+
+  add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var );
+
+  my $val = $nl->get_value($var);
+
+  if (remove_leading_and_trailing_quotes($val) eq "stress_falk" && not (&value_is_true($nl_flags->{'use_luna'})) ) {
+    $log->fatal_error(" use_luna=.true. is required for $var='stress_falk'.");
+  }
+
+}
+
+#-------------------------------------------------------------------------------
+
 sub setup_logic_luna {
   #
   # LUNA model to calculate photosynthetic capacities based on environmental conditions

bld/namelist_files/namelist_defaults_ctsm.xml

@@ -541,6 +541,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <jmaxb1 use_luna=".true." phys="clm5_1" >0.17</jmaxb1>
 <jmaxb1 use_luna=".true." phys="clm5_0" >0.17</jmaxb1>
 
+<!-- o3_veg_stress_method-->
+<o3_veg_stress_method>unset</o3_veg_stress_method>
+
 <use_grainproduct>.false.</use_grainproduct>
 <use_grainproduct use_crop=".true." phys="clm4_5" >.false.</use_grainproduct> <!-- 1-year grain product pool default to off for clm45 if crop is turned on -->
 <use_grainproduct use_crop=".true." phys="clm5_0" >.true.</use_grainproduct> <!-- 1-year grain product pool default to on for clm50 if crop is turned on -->

bld/namelist_files/namelist_definition_ctsm.xml

@@ -86,7 +86,6 @@ Type of CO2 feedback.
     diagnostic = use the diagnostic value sent from the atmosphere
 </entry>
 
-
 <entry id="suplnitro" type="char*15" category="clm_physics"
        group="clm_inparm" valid_values="NONE,ALL" >
 Supplemental Nitrogen mode and for what type of vegetation it's turned on for. 
@@ -1096,6 +1095,15 @@ Initial seed Carbon to use at planting
 (only used when CN is on as well as crop)
 </entry>
 
+<entry id="o3_veg_stress_method" type="char*32" category="physics"
+       group="clm_inparm" valid_values="unset,stress_lombardozzi2015,stress_falk" value="unset">
+       Parameter to set the type of ozone vegetation stress method 
+       unset                  = (default) ozone stress vegetation method is off 
+       stress_lombardozzi2015 = ozone stress vegetation functions from Danica Lombardozzi 2015
+       stress_falk            = ozone stress vegetation functions from Stefanie Falk (issue #1224)
+<default>Default: "unset"</default>
+</entry>       
+
 <entry id="onset_thresh_depends_on_veg" type="logical" category="physics"
        group="cnphenology">
 Phenology onset depends on the vegetation type
@@ -1108,11 +1116,6 @@ The minimum critical day length for onset depends on latitude
 (only used when CN is on)
 </entry>
 
-<entry id="use_ozone" type="logical" category="physics"
-       group="clm_inparm" valid_values="" value=".false.">
-Toggle to turn on ozone stress
-</entry>
-
 <entry id="use_snicar_frc" type="logical" category="physics"
        group="clm_inparm" valid_values="" value=".false.">
 Toggle to turn on calculation of SNow and Ice Aerosol Radiation model (SNICAR) radiative forcing

cime_config/testdefs/testlist_clm.xml

@@ -519,7 +519,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/o3">
+  <test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/o3lombardozzi2015">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
     </machines>
@@ -1010,7 +1010,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERP_P72x2_Ly3" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_o3_reduceOutput">
+  <test name="ERP_P72x2_Ly3" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_o3falk_reduceOutput">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>

cime_config/testdefs/testmods_dirs/clm/irrig_o3_reduceOutput/user_nl_clm → cime_config/testdefs/testmods_dirs/clm/irrig_o3falk_reduceOutput/user_nl_clm

@@ -1,6 +1,6 @@
 ! explicitly include stuff needed for o3 here rather than including the o3 directory,
 ! since the o3 directory includes default, and we don't want that for this
 ! reducedOutput testmod
-use_ozone = .true.
+o3_veg_stress_method    = 'stress_falk'
 hist_fincl1 += 'O3UPTAKESUN', 'O3UPTAKESHA'
 hist_fincl2 += 'O3UPTAKESUN', 'O3UPTAKESHA'

cime_config/testdefs/testmods_dirs/clm/o3lombardozzi2015/user_nl_clm

@@ -0,0 +1,2 @@
+ o3_veg_stress_method    = 'stress_lombardozzi2015'
+ hist_fincl2 += 'O3UPTAKESUN', 'O3UPTAKESHA'

src/biogeophys/CanopyFluxesMod.F90

@@ -224,7 +224,7 @@ subroutine CanopyFluxes(bounds,  num_exposedvegp, filter_exposedvegp,
     !
     ! !USES:
     use shr_const_mod      , only : SHR_CONST_RGAS, shr_const_pi
-    use clm_time_manager   , only : get_step_size_real, get_prev_date,is_end_curr_day
+    use clm_time_manager   , only : get_step_size_real, get_prev_date
     use clm_varcon         , only : sb, cpair, hvap, vkc, grav, denice, c_to_b
     use clm_varcon         , only : denh2o, tfrz, tlsai_crit, alpha_aero
     use clm_varcon         , only : c14ratio
@@ -237,6 +237,7 @@ subroutine CanopyFluxes(bounds,  num_exposedvegp, filter_exposedvegp,
                                     swbgt, hmdex, dis_coi, dis_coiS, THIndex, &
                                     SwampCoolEff, KtoC, VaporPres
     use SoilWaterRetentionCurveMod, only : soil_water_retention_curve_type
+    use LunaMod            , only : is_time_to_run_LUNA
     !
     ! !ARGUMENTS:
     type(bounds_type)                      , intent(in)            :: bounds 
@@ -402,7 +403,6 @@ subroutine CanopyFluxes(bounds,  num_exposedvegp, filter_exposedvegp,
     real(r8) :: h2ocan                                   ! total canopy water (mm H2O)
     real(r8) :: dt_veg_temp(bounds%begp:bounds%endp)
     integer  :: iv
-    logical  :: is_end_day                               ! is end of current day
     real(r8) :: dbh(bounds%begp:bounds%endp)             ! diameter at breast height of vegetation
     real(r8) :: cp_leaf(bounds%begp:bounds%endp)         ! heat capacity of leaves
     real(r8) :: cp_stem(bounds%begp:bounds%endp)         ! heat capacity of stems
@@ -615,7 +615,6 @@ subroutine CanopyFluxes(bounds,  num_exposedvegp, filter_exposedvegp,
       ! Determine step size
 
       dtime = get_step_size_real()
-      is_end_day = is_end_curr_day()
 
       ! Make a local copy of the exposedvegp filter. With the current implementation,
       ! this is needed because the filter is modified in the iteration loop.
@@ -1577,7 +1576,7 @@ subroutine CanopyFluxes(bounds,  num_exposedvegp, filter_exposedvegp,
                  surfalb_inst, solarabs_inst, &
                  temperature_inst)
 
-            if(is_end_day)then
+            if(is_time_to_run_LUNA())then
 
                call Acc240_Climate_LUNA(bounds, fn, filterp, &
                     o2(begp:endp), &
@@ -1600,7 +1599,8 @@ subroutine CanopyFluxes(bounds,  num_exposedvegp, filter_exposedvegp,
                     surfalb_inst, &
                     solarabs_inst, &
                     waterdiagnosticbulk_inst,&
-                    frictionvel_inst)        
+                    frictionvel_inst, &
+                    ozone_inst)
 
                call Clear24_Climate_LUNA(bounds, fn, filterp, &
                     canopystate_inst, photosyns_inst, &