New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 15519 – NEMO

Changeset 15519


Ignore:
Timestamp:
2021-11-16T18:06:59+01:00 (6 months 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:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/ICE/icedyn_rhg_eap.F90

    r15494 r15519  
    10191019 
    10201020      ! time 
    1021       it = ( kt - 1 ) * kitermax + kiter 
     1021      it = ( kt - nit000 ) * kitermax + kiter 
    10221022 
    10231023      ! convergence 
     
    10371037         istatus = NF90_PUT_VAR( ncvgid, nvarid, (/zresm/), (/it/), (/1/) ) 
    10381038         ! close file 
    1039          IF( kt == nitend )   istatus = NF90_CLOSE(ncvgid) 
     1039         IF( kt == nitend - nn_fsbc + 1 .AND. kiter == kitermax )   istatus = NF90_CLOSE(ncvgid) 
    10401040      ENDIF 
    10411041 
  • NEMO/trunk/src/ICE/icedyn_rhg_evp.F90

    r15494 r15519  
    993993 
    994994      ! time 
    995       it = ( kt - 1 ) * kitermax + kiter 
     995      it = ( kt - nit000 ) * kitermax + kiter 
    996996 
    997997      ! convergence 
     
    10211021         istatus = NF90_PUT_VAR( ncvgid, nvarid, (/zresm/), (/it/), (/1/) ) 
    10221022         ! close file 
    1023          IF( kt == nitend - nn_fsbc + 1 )   istatus = NF90_CLOSE(ncvgid) 
     1023         IF( kt == nitend - nn_fsbc + 1 .AND. kiter == kitermax )   istatus = NF90_CLOSE(ncvgid) 
    10241024      ENDIF 
    10251025 
  • NEMO/trunk/src/ICE/icedyn_rhg_vp.F90

    r15292 r15519  
    16341634 
    16351635      ! time 
    1636       it = ( kt - 1 ) * kitermax + kiter 
     1636      it = ( kt - nit000 ) * kitermax + kiter 
    16371637 
    16381638 
     
    16551655 
    16561656         ! close file 
    1657          IF( kt == nitend )   istatus = NF90_CLOSE( ncvgid ) 
     1657         IF( kt == nitend - nn_fsbc + 1 .AND. kiter == kitermax )   istatus = NF90_CLOSE(ncvgid) 
    16581658      ENDIF 
    16591659       
Note: See TracChangeset for help on using the changeset viewer.