Merge pull request #284 from rgknox/rgknox-logging-nl

logging namelist switch

Author: rgknox

biogeochem/EDLoggingMortalityMod.F90

@@ -36,6 +36,7 @@ module EDLoggingMortalityMod
    use FatesInterfaceMod , only : hlm_model_day
    use FatesInterfaceMod , only : hlm_day_of_year 
    use FatesInterfaceMod , only : hlm_days_per_year
+   use FatesInterfaceMod , only : hlm_use_logging
    use FatesConstantsMod , only : itrue,ifalse
    use FatesGlobals      , only : endrun => fates_endrun 
    use FatesGlobals      , only : fates_log
@@ -78,8 +79,7 @@ subroutine IsItLoggingTime(is_master,currentSite)
       logging_time = .false.
       icode = int(logging_event_code)
 
-!      if(hlm_use_logging.eq.ifalse) return     ! Don't turn on until fates-clm adds
-                                                ! this to the interface (RGK 08-2017)
+      if(hlm_use_logging.eq.ifalse) return
 
       if(icode .eq. 1) then
          ! Logging is turned off

main/FatesInterfaceMod.F90

@@ -1124,11 +1124,7 @@ subroutine set_fates_ctrlparms(tag,ival,rval,cval)
          hlm_use_vertsoilc = unset_int
          hlm_use_spitfire  = unset_int
          hlm_use_planthydro = unset_int
-         hlm_use_logging   = ifalse          ! (RGK: to allow backwards compatibility
-                                             !  defaulting to FALSE, this will allow
-                                             !  the call from the HLM to not necessarily
-                                             !  be forced to exist. Will set this to unset
-                                             !  along with other non backwards compatible changes
+         hlm_use_logging   = unset_int
          hlm_use_ed_st3    = unset_int
          hlm_use_ed_prescribed_phys = unset_int
          hlm_use_inventory_init = unset_int
@@ -1172,7 +1168,7 @@ subroutine set_fates_ctrlparms(tag,ival,rval,cval)
 
          if ( .not.((hlm_use_logging .eq.1).or.(hlm_use_logging.eq.0))    ) then
             if (fates_global_verbose()) then
-               write(fates_log(), *) 'The FATES namelist planthydro flag must be 0 or 1, exiting'
+               write(fates_log(), *) 'The FATES namelist use_logging flag must be 0 or 1, exiting'
             end if
             call endrun(msg=errMsg(sourcefile, __LINE__))
          end if
@@ -1411,7 +1407,7 @@ subroutine set_fates_ctrlparms(tag,ival,rval,cval)
             case('use_logging')
                hlm_use_logging = ival
                if (fates_global_verbose()) then
-                  write(fates_log(),*) 'Transfering hlm_use_planthydro= ',ival,' to FATES'
+                  write(fates_log(),*) 'Transfering hlm_use_logging= ',ival,' to FATES'
                end if
 
             case('use_ed_st3')