Merge remote-tracking branch 'escomp/b4b-dev' into update_submodules_cesm30alpha07g

Author: ekluzek

src/biogeochem/CNCIsoAtmTimeSeriesReadMod.F90

@@ -696,6 +696,8 @@ subroutine C13Streams( bounds )
     ! !LOCAL VARIABLES:
     integer :: g   ! Indices
 
+    ! TODO: Keep the Advance commented out until we can change answers
+    !call atm_c13_stream%Advance( )
     call atm_c13_stream%Interp( bounds)
 
     do g = bounds%begg, bounds%endg

src/biogeophys/PhotosynthesisMod.F90

@@ -2067,8 +2067,7 @@ subroutine PhotosynthesisTotal (bounds, fn, filterp, &
     !
     ! Determine total photosynthesis
     !
-    use CIsoAtmTimeseriesMod, only : C14BombSpike, C13TimeSeries
-    use CIsoAtmTimeseriesMod, only : rc13_atm_grc, rc14_atm_grc
+    use CIsoAtmTimeseriesMod, only : rc13_atm_grc, rc14_atm_grc  ! Atmospheric Carbon isotope timeseries data
     ! !ARGUMENTS:
     type(bounds_type)      , intent(in)    :: bounds
     integer                , intent(in)    :: fn                             ! size of pft filter
@@ -2113,11 +2112,6 @@ subroutine PhotosynthesisTotal (bounds, fn, filterp, &
          fpsn_wp     => photosyns_inst%fpsn_wp_patch       & ! Output: [real(r8) (:) ]  product-limited photosynthesis (umol CO2 /m**2 /s)
          )
 
-      ! Get the current C13/C14 ratio in the atmosphere from timeseries data or the fixed values
-      ! These calls fill the data: rc13_atm_grc and rc14_atm_grc
-      if ( use_c14 ) call C14BombSpike(bounds)
-      if ( use_c13 ) call C13TimeSeries(bounds, atm2lnd_inst)
-
       do f = 1, fn
          p = filterp(f)
          g = patch%gridcell(p)

src/cpl/share_esmf/CTSMForce2DStreamBaseType.F90

@@ -278,7 +278,16 @@ subroutine Advance(this)
          integer :: sec     ! seconds into current date for nstep+1
          integer :: mcdate  ! Current model date (yyyymmdd)
          integer :: rc      ! Error return code
-
+#ifdef _OPENMP
+         logical, external :: omp_in_parallel
+#endif
+
+#ifdef _OPENMP
+         if ( omp_in_parallel() )then
+            call endrun( 'CTSM forcing Streams Advance is being called from within an OMP loop and should NOT be', &
+                         file=sourcefile, line=__LINE__ )
+         end if
+#endif
          ! Advance sdat stream
          call get_curr_date(year, mon, day, sec)
          mcdate = year*10000 + mon*100 + day

src/main/clm_driver.F90

@@ -118,6 +118,7 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
     use laiStreamMod          , only : lai_advance
     use FATESFireFactoryMod   , only : scalar_lightning
     use FatesInterfaceTypesMod, only : fates_dispersal_cadence_none
+    use CIsoAtmTimeseriesMod, only : C14BombSpike, C13TimeSeries
     !
     ! !ARGUMENTS:
     implicit none
@@ -408,6 +409,14 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
        call PrescribedSoilMoistureAdvance( bounds_proc )
        call t_stopf('prescribed_sm')
     endif
+    if ( use_cn )then
+       ! Get the current C13/C14 ratio in the atmosphere from timeseries data or the fixed values
+       ! These calls fill the data: rc13_atm_grc and rc14_atm_grc
+       ! NOTE: These calls need to happen outside loops over nclumps (as streams are not threadsafe).
+       ! TODO: This should probably be moved to CNVegetationFacade in the InterpFileInputs subroutine
+       if ( use_c14 ) call C14BombSpike(bounds_proc)
+       if ( use_c13 ) call C13TimeSeries(bounds_proc, atm2lnd_inst)
+    end if
     ! ============================================================================
     ! Initialize the column-level mass balance checks for water, carbon & nitrogen.
     !