Merge pull request #22 from mvertens/feature/fix_for_icewav_coupling

fix needed for ice/wav coupling
ESCOMP · Oct 5, 2022 · efe9b21 · efe9b21
2 parents 2821022 + d23f92f
commit efe9b21
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/cicecore/cicedynB/general/ice_state.F90 b/cicecore/cicedynB/general/ice_state.F90
@@ -10,7 +10,7 @@
 ! aicen(i,j,n)         aice(i,j)           ---
 ! vicen(i,j,n)         vice(i,j)           m
 ! vsnon(i,j,n)         vsno(i,j)           m
-! trcrn(i,j,it,n)      trcr(i,j,it)        
+! trcrn(i,j,it,n)      trcr(i,j,it)
 !
 ! Area is dimensionless because aice is the fractional area
 ! (normalized so that the sum over all categories, including open
@@ -114,7 +114,7 @@ module ice_state
          strength     ! ice strength (N/m)
 
       !-----------------------------------------------------------------
-      ! ice state at start of time step, saved for later in the step 
+      ! ice state at start of time step, saved for later in the step
       !-----------------------------------------------------------------
 
       real (kind=dbl_kind), dimension(:,:,:), allocatable, &
@@ -125,15 +125,15 @@ module ice_state
          dimension(:,:,:,:), allocatable, public :: &
          aicen_init  , & ! initial ice concentration, for linear ITD
          vicen_init  , & ! initial ice volume (m), for linear ITD
-         vsnon_init      ! initial snow volume (m), for aerosol 
+         vsnon_init      ! initial snow volume (m), for aerosol
 
 !=======================================================================
 
       contains
 
 !=======================================================================
 !
-! Allocate space for all state variables 
+! Allocate space for all state variables
 !
       subroutine alloc_state
       integer (int_kind) :: ntrcr, ierr
@@ -160,7 +160,7 @@ subroutine alloc_state
          vsnon     (nx_block,ny_block,ncat,max_blocks) , & ! volume per unit area of snow (m)
          aicen_init(nx_block,ny_block,ncat,max_blocks) , & ! initial ice concentration, for linear ITD
          vicen_init(nx_block,ny_block,ncat,max_blocks) , & ! initial ice volume (m), for linear ITD
-         vsnon_init(nx_block,ny_block,ncat,max_blocks) , & ! initial snow volume (m), for aerosol 
+         vsnon_init(nx_block,ny_block,ncat,max_blocks) , & ! initial snow volume (m), for aerosol
          trcr      (nx_block,ny_block,ntrcr,max_blocks) , & ! ice tracers: 1: surface temperature of ice/snow (C)
          trcrn     (nx_block,ny_block,ntrcr,ncat,max_blocks) , & ! tracers: 1: surface temperature of ice/snow (C)
          stat=ierr)
@@ -173,11 +173,12 @@ subroutine alloc_state
          trcr_base(ntrcr,3)   , & ! = 0 or 1 depending on tracer dependency, (1) aice, (2) vice, (3) vsno
          stat=ierr)
       if (ierr/=0) call abort_ice('(alloc_state): Out of memory2')
- 
+
       trcr_depend = 0
       n_trcr_strata = 0
       nt_strata = 0
       trcr_base = c0
+      aicen_init = c0  ! new from denise
 
       end subroutine alloc_state