Get FATES and carbon_only test-suite tests to pass with MIMICS active

src/main/ColumnType.F90

@@ -49,6 +49,8 @@ module ColumnType
      logical , pointer :: active               (:)   ! true=>do computations on this column
      logical , pointer :: type_is_dynamic      (:)   ! true=>itype can change throughout the run
 
+     logical , pointer :: copy_fates_var       (:)   ! .true. -> copy variable from FATES to CTSM in clmfates_interface
+                                                     ! .false. -> do not copy in clmfates_interface and use value already in memory
      logical , pointer :: is_fates             (:)   ! .true. -> this is a fates column
                                                      ! .false. -> this is NOT a fates column
 
@@ -120,6 +122,7 @@ subroutine Init(this, begc, endc)
     allocate(this%type_is_dynamic(begc:endc))                  ; this%type_is_dynamic(:) = .false.
 
     allocate(this%is_fates(begc:endc))                         ; this%is_fates(:) = .false.
+    allocate(this%copy_fates_var(begc:endc))                   ; this%copy_fates_var(:) = .false.
 
     ! The following is set in initVerticalMod
     allocate(this%snl         (begc:endc))                     ; this%snl         (:)   = ispval  !* cannot be averaged up
@@ -159,6 +162,7 @@ subroutine Clean(this)
     deallocate(this%itype      )
     deallocate(this%lun_itype  )
     deallocate(this%active     )
+    deallocate(this%copy_fates_var)
     deallocate(this%is_fates   )
     deallocate(this%type_is_dynamic)
     deallocate(this%snl        )

src/utils/clmfates_interfaceMod.F90

@@ -233,7 +233,6 @@ module CLMFatesInterfaceMod
    private :: GetAndSetTime
 
    logical :: debug  = .false.
-   logical, allocatable :: copy_fates_var(:)  ! True if prefer to copy var from FATES to CTSM in clmfates_interface
 
    character(len=*), parameter, private :: sourcefile = &
         __FILE__
@@ -546,15 +545,13 @@ subroutine init(this, bounds_proc )
          write(iulog,*) 'clm_fates%init():  allocating for ',nclumps,' threads'
       end if
 
-
       !$OMP PARALLEL DO PRIVATE (nc,bounds_clump,nmaxcol,s,c,l,g,collist,pi,pf,ft)
       do nc = 1,nclumps
          call get_clump_bounds(nc, bounds_clump)
+
          nmaxcol = bounds_clump%endc - bounds_clump%begc + 1
 
          allocate(collist(1:nmaxcol))
-         allocate(copy_fates_var(1:nmaxcol))
-         copy_fates_var(:) = .false.  ! .false. when starting any run
 
          ! Allocate the mapping that points columns to FATES sites, 0 is NA
          allocate(this%f2hmap(nc)%hsites(bounds_clump%begc:bounds_clump%endc))
@@ -583,6 +580,8 @@ subroutine init(this, bounds_proc )
                end if
             endif
 
+            col%copy_fates_var(c) = .false.
+
          enddo
 
          if(debug)then
@@ -1112,7 +1111,7 @@ subroutine wrap_update_hlmfates_dyn(this, nc, bounds_clump,      &
        !------------------------------------------------------------------------
        ! FATES calculation of ligninNratio
        !------------------------------------------------------------------------
-       ! If it's the first timestep of a restart and copy_fates_var(c) = .false.
+       ! If it's the first timestep of a restart & copy_fates_var(c) = .false.
        ! (this will happen in the first timestep of any restart)
        ! then skip this variable because a more accurate value was obtained
        ! from the restart file.
@@ -1128,8 +1127,8 @@ subroutine wrap_update_hlmfates_dyn(this, nc, bounds_clump,      &
        !------------------------------------------------------------------------
        do s = 1, this%fates(nc)%nsites
           c = this%f2hmap(nc)%fcolumn(s)
-          if (is_first_restart_step() .and. .not. copy_fates_var(c)) then
-             copy_fates_var(c) = .true.
+          if (is_first_restart_step() .and. .not. col%copy_fates_var(c)) then
+             col%copy_fates_var(c) = .true.
           else
              soilbiogeochem_carbonflux_inst%litr_lig_c_to_n_col(c) = &
                this%fates(nc)%bc_out(s)%litt_flux_ligc_per_n