Merge pull request #46 from JensBDebernard/bugfix_coupling_initializa…

…tion Bugfix coupling initialization
metno · Apr 14, 2023 · 1e0491a · 1e0491a
2 parents c8bbcfb + 42c2262
commit 1e0491a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/apps/common/modified_src/cice5.1.2/source/ice_accum_shared.F90 b/apps/common/modified_src/cice5.1.2/source/ice_accum_shared.F90
@@ -7,8 +7,8 @@ module ice_accum_shared
       implicit none
 
       logical (kind=log_kind), public :: &
-               bool_accum_write = .true., &  ! if .true., write age tracer restartfile
-               bool_accum_read = .false.     ! same but for reading
+           bool_accum_write = .true., & ! if .true., write age tracer restartfile
+           bool_accum_read = .true.     ! same but for reading
 
       real (kind=dbl_kind), public :: accum_time
 

diff --git a/apps/common/modified_src/cice5.1.2/source/ice_itd.F90 b/apps/common/modified_src/cice5.1.2/source/ice_itd.F90
@@ -29,7 +29,7 @@ module ice_itd
       use ice_constants
       use ice_communicate, only: my_task, master_task
       use ice_domain_size, only: ncat, max_aero, nilyr, nslyr, n_aero, nblyr
-      use ice_fileunits, only: nu_diag
+      use ice_fileunits, only: nu_diag, ice_stderr
 
       implicit none
       save
@@ -2417,7 +2417,7 @@ subroutine zap_snow_temperature(nx_block,   ny_block, &
 
         enddo ! n
 
-        if (nzaps > 0) write(nu_diag,*) &
+        if (nzaps > 0) write(ice_stderr,*) &
              'zap_snow_temperature :: ',nzaps,' points zaped at proc ',my_task
 
       end subroutine zap_snow_temperature

diff --git a/apps/common/modified_src/roms-trunk820/main3d.F b/apps/common/modified_src/roms-trunk820/main3d.F
@@ -342,11 +342,12 @@ SUBROUTINE main3d (RunInterval)
 !-----------------------------------------------------------------------
 !
         DO ng=1,Ngrids
-          IF ((iic(ng).ne.ntstart(ng)).and.                             &
-     &        MOD(iic(ng)-1,CoupleSteps(Icice,ng)).eq.0) THEN
-            DO tile=first_tile(ng),last_tile(ng),+1
-              CALL ocn2cice_coupling (ng, TILE,CoupleSteps(Icice,ng))
-            END DO
+!jd           IF ((iic(ng).ne.ntstart(ng)).and.                             &
+           if ( MOD(iic(ng)-1,CoupleSteps(Icice,ng)).eq.0 .and.             &
+     &          iic(ng) .lt. (ntend(ng)+1) ) THEN
+              DO tile=first_tile(ng),last_tile(ng),+1
+                 CALL ocn2cice_coupling (ng, TILE,CoupleSteps(Icice,ng))
+              END DO
 !$OMP BARRIER
           END IF
         END DO