Changeset 15027 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/IOM/restart.F90

Timestamp:

2021-06-19T10:14:22+02:00 (3 years ago)

Author:

techene

Message:

2605: restartability OK reproducibility ~OK (when not using RGBc) for MLF, restartability OK reproducibility OK for RK3 (with appropriate CFGs)

File:

• NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/IOM/restart.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/IOM/restart.F90

@@ -325 +325 @@
       !
       IF( .NOT.lk_SWE ) THEN
-         IF(.NOT. (iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0) ) THEN
+         IF( iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0 ) THEN
+            CALL iom_get( numror, jpdom_auto, 'rhop'   , rhop )   ! now    potential density
+         ELSE
 #if defined key_RK3
-            CALL eos( ts(:,:,:,:,:), Kbb, rhop)
+            CALL eos( ts, Kbb, rhop )
 #else
-            CALL eos( ts(:,:,:,:,:), Kmm, rhop)
-         ELSE
-            CALL iom_get( numror, jpdom_auto, 'rhop'   , rhop )   ! now    potential density
+            CALL eos( ts, Kmm, rhop )
 #endif
+!!#if defined key_qco
+!!            ALLOCATE( zgdept(jpi,jpj,jpk) )
+!!            DO jk = 1, jpk
+!!               zgdept(:,:,jk) = gdept(:,:,jk,Kmm)
+!!            END DO
+!!            CALL eos( ts(:,:,:,:,Kmm), rhd, rhop, zgdept )
+!!            DEALLOCATE( zgdept )
+!!#else
+!!            CALL eos( ts(:,:,:,:,Kmm), rhd, rhop, gdept(:,:,:,Kmm) )
+!!#endif
          ENDIF
       ENDIF