Changeset 13149 for NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/LDF/ldfslp.F90

Timestamp:

2020-06-24T09:03:45+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2482: Dissable restart and use allocatable arrays

File:

• NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/LDF/ldfslp.F90 (modified) (5 diffs)

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/LDF/ldfslp.F90

@@ -70 +70 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   vslpml, wslpjml   ! j_slope at V- and W-points just below the mixed layer
 
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :)    ::  zslpml_hmlpu, zslpml_hmlpv
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::  zgru, zwz, zdzr
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :) ::  zgrv, zww
+
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :)       ::   z1_mlbw
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :)    ::   zalbet
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :, :) ::   zdxrho , zdyrho, zdzrho     ! Horizontal and vertical density gradients
+   REAL(wp), ALLOCATABLE, DIMENSION(:, :, :, :) ::   zti_mlb, ztj_mlb            ! for Griffies operator only
+
+
    REAL(wp) ::   repsln = 1.e-25_wp       ! tiny value used as minium of di(rho), dj(rho) and dk(rho)
 
@@ -118 +128 @@
       REAL(wp) ::   zck, zfk,      zbw             !   -      -
       REAL(wp) ::   zdepu, zdepv                   !   -      -
-      REAL(wp), DIMENSION(jpi,jpj)     ::  zslpml_hmlpu, zslpml_hmlpv
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::  zgru, zwz, zdzr
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::  zgrv, zww
+!     REAL(wp), DIMENSION(jpi,jpj)     ::  zslpml_hmlpu, zslpml_hmlpv
+!     REAL(wp), DIMENSION(jpi,jpj,jpk) ::  zgru, zwz, zdzr
+!     REAL(wp), DIMENSION(jpi,jpj,jpk) ::  zgrv, zww
       !!----------------------------------------------------------------------
       !
@@ -401 +411 @@
       REAL(wp) ::   zdzrho_raw
       REAL(wp) ::   zbeta0, ze3_e1, ze3_e2
-      REAL(wp), DIMENSION(jpi,jpj)     ::   z1_mlbw
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zalbet
-      REAL(wp), DIMENSION(jpi,jpj,jpk,0:1) ::   zdxrho , zdyrho, zdzrho     ! Horizontal and vertical density gradients
-      REAL(wp), DIMENSION(jpi,jpj,0:1,0:1) ::   zti_mlb, ztj_mlb            ! for Griffies operator only
+!     REAL(wp), DIMENSION(jpi,jpj)     ::   z1_mlbw
+!     REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zalbet
+!     REAL(wp), DIMENSION(jpi,jpj,jpk,0:1) ::   zdxrho , zdyrho, zdzrho     ! Horizontal and vertical density gradients
+!     REAL(wp), DIMENSION(jpi,jpj,0:1,0:1) ::   zti_mlb, ztj_mlb            ! for Griffies operator only
       !!----------------------------------------------------------------------
       !
@@ -750 +760 @@
       ALLOCATE( ah_wslp2(jpi,jpj,jpk) , akz(jpi,jpj,jpk) , STAT=ierr )
       IF( ierr > 0 )   CALL ctl_stop( 'STOP', 'ldf_slp_init : unable to allocate ah_slp2 or akz' )
+      ALLOCATE(zslpml_hmlpu(jpi,jpj), zslpml_hmlpv(jpi,jpj))
+      ALLOCATE(zgru(jpi,jpj,jpk), zwz(jpi,jpj,jpk), zdzr(jpi,jpj,jpk))
+      ALLOCATE(zgrv(jpi,jpj,jpk), zww(jpi,jpj,jpk))
+
       !
       IF( ln_traldf_triad ) THEN        ! Griffies operator : triad of slopes
@@ -765 +779 @@
             &      vslp(jpi,jpj,jpk) , vslpml(jpi,jpj) , wslpj(jpi,jpj,jpk) , wslpjml(jpi,jpj) , STAT=ierr )
          IF( ierr > 0 )   CALL ctl_stop( 'STOP', 'ldf_slp_init : unable to allocate Madec operator slope ' )
+
+          ALLOCATE(z1_mlbw(jpi,jpj))
+          ALLOCATE(zalbet(jpi,jpj,jpk))
+          ALLOCATE(zdxrho(jpi,jpj,jpk,0:1) , zdyrho(jpi,jpj,jpk,0:1), zdzrho(jpi,jpj,jpk,0:1) )
+          ALLOCATE(zti_mlb(jpi,jpj,0:1,0:1), ztj_mlb(jpi,jpj,0:1,0:1))
 
          ! Direction of lateral diffusion (tracers and/or momentum)