Changeset 12770

Timestamp:

2020-04-17T17:12:15+02:00 (3 years ago)

Author:

gsamson

Message:

fix ABL restartability issue (ticket #2419)

Location:

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/ABL

Files:

• ablrst.F90 (modified) (3 diffs)
• sbcabl.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/ABL/ablrst.F90

@@ -109 +109 @@
       CALL iom_delay_rst( 'WRITE', 'ABL', numraw )   ! save only abl delayed global communication variables
 
-      ! Prognostic variables
+      ! Prognostic (after timestep + swap time indices = now timestep) variables
       CALL iom_rstput( iter, nitrst, numraw,   'u_abl',   u_abl(:,:,:,nt_n      ) )
       CALL iom_rstput( iter, nitrst, numraw,   'v_abl',   v_abl(:,:,:,nt_n      ) )
@@ -117 +117 @@
       CALL iom_rstput( iter, nitrst, numraw, 'avm_abl', avm_abl(:,:,:           ) )
       CALL iom_rstput( iter, nitrst, numraw, 'avt_abl', avt_abl(:,:,:           ) )
+      CALL iom_rstput( iter, nitrst, numraw,'mxld_abl',mxld_abl(:,:,:           ) )
       CALL iom_rstput( iter, nitrst, numraw,    'pblh',    pblh(:,:             ) )
       !
@@ -171 +172 @@
       CALL iom_get( numrar, jpdom_autoglo, 'avm_abl', avm_abl(:,:,:           ) )
       CALL iom_get( numrar, jpdom_autoglo, 'avt_abl', avt_abl(:,:,:           ) )
+      CALL iom_get( numrar, jpdom_autoglo,'mxld_abl',mxld_abl(:,:,:           ) )
       CALL iom_get( numrar, jpdom_autoglo,    'pblh',    pblh(:,:             ) )
       CALL iom_delay_rst( 'READ', 'ABL', numrar )   ! read only abl delayed global communication variables

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/ABL/sbcabl.F90

@@ -267 +267 @@
 
       ! Initialize the time index for now time (nt_n) and after time (nt_a)
-      nt_n = 1 + MOD( nit000  , 2)
-      nt_a = 1 + MOD( nit000+1, 2)
+      nt_n = 1 + MOD( nit000+1, 2)
+      nt_a = 1 + MOD( nit000  , 2)
 
       ! initialize ABL from data or restart