Changeset 15519

Timestamp:

2021-11-16T18:06:59+01:00 (2 years ago)

Author:

edblockley

Message:

Trunk: Correction to rheology convergence timeseries output to ensure that all iterations on last time-step are output and that the time-axis only includes point from the current run cycle (i.e., starting from nit000+1). Replicated from 4.0-HEAD (changeset:15518) and extended to include EAP and VP routines.

Location:

NEMO/trunk/src/ICE

Files:

• icedyn_rhg_eap.F90 (modified) (2 diffs)
• icedyn_rhg_evp.F90 (modified) (2 diffs)
• icedyn_rhg_vp.F90 (modified) (2 diffs)

NEMO/trunk/src/ICE/icedyn_rhg_eap.F90

@@ -1019 +1019 @@
 
       ! time
-      it = ( kt - 1 ) * kitermax + kiter
+      it = ( kt - nit000 ) * kitermax + kiter
 
       ! convergence
@@ -1037 +1037 @@
          istatus = NF90_PUT_VAR( ncvgid, nvarid, (/zresm/), (/it/), (/1/) )
          ! close file
-         IF( kt == nitend )   istatus = NF90_CLOSE(ncvgid)
+         IF( kt == nitend - nn_fsbc + 1 .AND. kiter == kitermax )   istatus = NF90_CLOSE(ncvgid)
       ENDIF
 

NEMO/trunk/src/ICE/icedyn_rhg_evp.F90

@@ -993 +993 @@
 
       ! time
-      it = ( kt - 1 ) * kitermax + kiter
+      it = ( kt - nit000 ) * kitermax + kiter
 
       ! convergence
@@ -1021 +1021 @@
          istatus = NF90_PUT_VAR( ncvgid, nvarid, (/zresm/), (/it/), (/1/) )
          ! close file
-         IF( kt == nitend - nn_fsbc + 1 )   istatus = NF90_CLOSE(ncvgid)
+         IF( kt == nitend - nn_fsbc + 1 .AND. kiter == kitermax )   istatus = NF90_CLOSE(ncvgid)
       ENDIF
 

NEMO/trunk/src/ICE/icedyn_rhg_vp.F90

@@ -1634 +1634 @@
 
       ! time
-      it = ( kt - 1 ) * kitermax + kiter
+      it = ( kt - nit000 ) * kitermax + kiter
 
 
@@ -1655 +1655 @@
 
          ! close file
-         IF( kt == nitend )   istatus = NF90_CLOSE( ncvgid )
+         IF( kt == nitend - nn_fsbc + 1 .AND. kiter == kitermax )   istatus = NF90_CLOSE(ncvgid)
       ENDIF