Changeset 14179 for NEMO/trunk/src/OCE/IOM/restart.F90

Timestamp:

2020-12-15T23:17:09+01:00 (4 years ago)

Author:

techene

Message:

#2385 restart with qco bug fix for euler 1st and RK3

File:

• NEMO/trunk/src/OCE/IOM/restart.F90 (modified) (11 diffs)

NEMO/trunk/src/OCE/IOM/restart.F90

@@ -47 +47 @@
    !! * Substitutions
 #  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -169 +170 @@
          ENDIF
          !
+#if ! defined key_RK3
          CALL iom_rstput( kt, nitrst, numrow, 'sshn'   , ssh(:,:        ,Kmm) )     ! now fields
          CALL iom_rstput( kt, nitrst, numrow, 'un'     , uu(:,:,:       ,Kmm) )
@@ -177 +179 @@
             CALL iom_rstput( kt, nitrst, numrow, 'rhop', rhop                 )
          ENDIF
+#endif
       ENDIF
 
@@ -264 +267 @@
       INTEGER  ::   jk
       REAL(wp), DIMENSION(jpi, jpj, jpk) :: w3d
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:)   :: zgdept       ! 3D workspace for QCO
       !!----------------------------------------------------------------------
       !
@@ -279 +283 @@
       ENDIF
       !
-      !                             !*  Read Kmm fields
+#if defined key_RK3
+      !                             !*  Read Kbb fields   (NB: in RK3 Kmm = Kbb = Nbb)
+      IF(lwp) WRITE(numout,*) '           Kbb u, v and T-S fields read in the restart file'
+      CALL iom_get( numror, jpdom_auto, 'ub'   , uu(:,:,:       ,Kbb), cd_type = 'U', psgn = -1._wp )
+      CALL iom_get( numror, jpdom_auto, 'vb'   , vv(:,:,:       ,Kbb), cd_type = 'V', psgn = -1._wp )
+      IF( .NOT.lk_SWE ) THEN
+         CALL iom_get( numror, jpdom_auto, 'tb', ts(:,:,:,jp_tem,Kbb) )
+         CALL iom_get( numror, jpdom_auto, 'sb', ts(:,:,:,jp_sal,Kbb) )
+      ENDIF
+#else
+      !                             !*  Read Kmm fields   (MLF only)
       IF(lwp) WRITE(numout,*)    '           Kmm u, v and T-S fields read in the restart file'
       CALL iom_get( numror, jpdom_auto, 'un'   , uu(:,:,:       ,Kmm), cd_type = 'U', psgn = -1._wp )
@@ -288 +302 @@
       ENDIF
       !
-      IF( l_1st_euler ) THEN        !*  Euler restart
+      IF( l_1st_euler ) THEN        !*  Euler restart   (MLF only)
          IF(lwp) WRITE(numout,*) '           Kbb u, v and T-S fields set to Kmm values'
          uu(:,:,:  ,Kbb) = uu(:,:,:  ,Kmm)         ! all before fields set to now values
@@ -294 +308 @@
          IF( .NOT.lk_SWE ) ts(:,:,:,:,Kbb) = ts(:,:,:,:,Kmm)
          !
-      ELSE                          !* Leap frog restart
+      ELSE                          !* Leap frog restart   (MLF only)
          IF(lwp) WRITE(numout,*) '           Kbb u, v and T-S fields read in the restart file'
          CALL iom_get( numror, jpdom_auto, 'ub'   , uu(:,:,:       ,Kbb), cd_type = 'U', psgn = -1._wp )
@@ -303 +317 @@
          ENDIF
       ENDIF
+#endif
       !
       IF( .NOT.lk_SWE ) THEN
@@ -308 +323 @@
             CALL iom_get( numror, jpdom_auto, 'rhop'   , rhop )   ! now    potential density
          ELSE
+#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
@@ -347 +371 @@
          !                         !=============================!
          !
-         !                                     !*  Read ssh at Kmm
+#if defined key_RK3
+         !                                     !*  RK3: Read ssh at Kbb
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*)    '      Kbb sea surface height read in the restart file'
+         CALL iom_get( numror, jpdom_auto, 'sshb'   , ssh(:,:,Kbb) )
+         !
+         !                                     !*  RK3: Set ssh at Kmm for AGRIF
+         ssh(:,:,Kmm) = 0._wp
+#else
+         !                                     !*  MLF: Read ssh at Kmm
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*)    '      Kmm sea surface height read in the restart file'
          CALL iom_get( numror, jpdom_auto, 'sshn'   , ssh(:,:,Kmm) )
          !
-         IF( l_1st_euler ) THEN                !* Euler at first time-step
+         IF( l_1st_euler ) THEN                !*  MLF: Euler at first time-step
             IF(lwp) WRITE(numout,*)
             IF(lwp) WRITE(numout,*) '      Euler first time step : ssh(Kbb) = ssh(Kmm)'
             ssh(:,:,Kbb) = ssh(:,:,Kmm)
             !
-         ELSE                                  !* read ssh at Kbb
+         ELSE                                  !*  MLF: read ssh at Kbb
             IF(lwp) WRITE(numout,*)
             IF(lwp) WRITE(numout,*) '      Kbb sea surface height read in the restart file'
             CALL iom_get( numror, jpdom_auto, 'sshb', ssh(:,:,Kbb) )
          ENDIF
+#endif
          !                         !============================!
       ELSE                         !==  Initialize at "rest"  ==!
@@ -390 +424 @@
          ENDIF
          !
-         ssh(:,:,Kmm) = ssh(:,:,Kbb)           !* set now values from to before ones 
+#if defined key_RK3
+         ssh(:,:,Kmm) = 0._wp                  !* RK3: set Kmm to 0 for AGRIF
+#else
+         ssh(:,:,Kmm) = ssh(:,:,Kbb)           !* MLF: set now values from to before ones 
+#endif
       ENDIF
       !
       !                            !==========================!
-      ssh(:,:,Kaa) = 0._wp         !==  Set to 0 for agrif  ==!
+      ssh(:,:,Kaa) = 0._wp         !==  Set to 0 for AGRIF  ==!
       !                            !==========================!
       !