Changeset 11467 for NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA

Timestamp:

2019-08-22T11:49:08+02:00 (5 years ago)

Author:

andmirek

Message:

Ticket #2197 allocate arrays at the beggining of the run

Location:

NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA

Files:

• traadv.F90 (modified) (3 diffs)
• tranxt.F90 (modified) (3 diffs)
• traqsr.F90 (modified) (8 diffs)
• trasbc.F90 (modified) (4 diffs)

NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traadv.F90

@@ -83 +83 @@
       !! ** Method  : - Update (ua,va) with the advection term following nadv
       !!----------------------------------------------------------------------
+      USE scoce, ONLY : zun => scr1, zvn => scr2, zwn => scr3, &  ! 3D workspace
+                       ztrdt => scr4, ztrds => scr5
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
       INTEGER ::   jk   ! dummy loop index
-      REAL(wp), DIMENSION(jpi,jpj,jpk)        :: zun, zvn, zwn   ! 3D workspace
-      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   ztrdt, ztrds
       !!----------------------------------------------------------------------
       !
@@ -138 +138 @@
       !
       IF( l_trdtra )   THEN                    !* Save ta and sa trends
-         ALLOCATE( ztrdt(jpi,jpj,jpk), ztrds(jpi,jpj,jpk) )
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem)
          ztrds(:,:,:) = tsa(:,:,:,jp_sal)
@@ -165 +164 @@
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_totad, ztrdt )
          CALL trd_tra( kt, 'TRA', jp_sal, jptra_totad, ztrds )
-         DEALLOCATE( ztrdt, ztrds )
       ENDIF
       !                                              ! print mean trends (used for debugging)

NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/tranxt.F90

@@ -86 +86 @@
       !! ** Action  : - tsb & tsn ready for the next time step
       !!----------------------------------------------------------------------
+      USE scoce, ONLY : ztrdt => scr1, ztrds => scr2 
       INTEGER, INTENT(in) ::   kt    ! ocean time-step index
       !!
       INTEGER  ::   ji, jj, jk, jn   ! dummy loop indices
       REAL(wp) ::   zfact            ! local scalars
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   ztrdt, ztrds
       !!----------------------------------------------------------------------
       !
@@ -118 +118 @@
       ! trends computation initialisation
       IF( l_trdtra )   THEN                    
-         ALLOCATE( ztrdt(jpi,jpj,jpk) , ztrds(jpi,jpj,jpk) )
          ztrdt(:,:,jpk) = 0._wp
          ztrds(:,:,jpk) = 0._wp
@@ -178 +177 @@
          CALL trd_tra( kt, 'TRA', jp_sal, jptra_atf, ztrds )
       END IF
-      IF( l_trdtra )   DEALLOCATE( ztrdt , ztrds )
       !
       !                        ! control print

NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/traqsr.F90

@@ -101 +101 @@
       !!              Morel, A. et Berthon, JF, 1989, Limnol Oceanogr 34(8), 1545-1562
       !!----------------------------------------------------------------------
+      USE scoce, ONLY : zekb => scr2D1, zekg => scr2D2, zekr => scr2D3, &
+                       ze0 => scr1, ze1 => scr2, ze2 => scr3, ze3 => scr4, zea => scr5, ztrdt => scr6, &
+                       zetot => scr7, zchl3d => scr8 
       INTEGER, INTENT(in) ::   kt     ! ocean time-step
       !
@@ -111 +114 @@
       REAL(wp) ::   zCb, zCmax, zze, zpsi, zpsimax, zdelpsi, zCtot, zCze
       REAL(wp) ::   zlogc, zlogc2, zlogc3 
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:)   :: zekb, zekg, zekr
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: ze0, ze1, ze2, ze3, zea, ztrdt
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zetot, zchl3d
       !!----------------------------------------------------------------------
       !
@@ -125 +125 @@
       !
       IF( l_trdtra ) THEN      ! trends diagnostic: save the input temperature trend
-         ALLOCATE( ztrdt(jpi,jpj,jpk) ) 
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem)
       ENDIF
@@ -158 +157 @@
          !
       CASE( np_RGB , np_RGBc )         !==  R-G-B fluxes  ==!
-         !
-         ALLOCATE( zekb(jpi,jpj)     , zekg(jpi,jpj)     , zekr  (jpi,jpj)     , &
-            &      ze0 (jpi,jpj,jpk) , ze1 (jpi,jpj,jpk) , ze2   (jpi,jpj,jpk) , &
-            &      ze3 (jpi,jpj,jpk) , zea (jpi,jpj,jpk) , zchl3d(jpi,jpj,jpk)   ) 
          !
          IF( nqsr == np_RGBc ) THEN          !*  Variable Chlorophyll
@@ -239 +234 @@
          END DO
          !
-         DEALLOCATE( zekb , zekg , zekr , ze0 , ze1 , ze2 , ze3 , zea , zchl3d ) 
-         !
       CASE( np_2BD  )            !==  2-bands fluxes  ==!
          !
@@ -278 +271 @@
       !
       IF( iom_use('qsr3d') ) THEN      ! output the shortwave Radiation distribution
-         ALLOCATE( zetot(jpi,jpj,jpk) )
          zetot(:,:,nksr+1:jpk) = 0._wp     ! below ~400m set to zero
          DO jk = nksr, 1, -1
@@ -284 +276 @@
          END DO         
          CALL iom_put( 'qsr3d', zetot )   ! 3D distribution of shortwave Radiation
-         DEALLOCATE( zetot ) 
       ENDIF
       !
@@ -297 +288 @@
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_qsr, ztrdt )
-         DEALLOCATE( ztrdt ) 
       ENDIF
       !                       ! print mean trends (used for debugging)

NEMO/branches/UKMO/dev_r10037_GPU/src/OCE/TRA/trasbc.F90

@@ -73 +73 @@
       !!              - send trends to trdtra module for further diagnostics(l_trdtra=T)
       !!----------------------------------------------------------------------
+      USE scoce, ONLY : ztrdt => scr1, ztrds => scr2
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
@@ -78 +79 @@
       INTEGER  ::   ikt, ikb                    ! local integers
       REAL(wp) ::   zfact, z1_e3t, zdep, ztim   ! local scalar
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::  ztrdt, ztrds
       !!----------------------------------------------------------------------
       !
@@ -90 +90 @@
       !
       IF( l_trdtra ) THEN                    !* Save ta and sa trends
-         ALLOCATE( ztrdt(jpi,jpj,jpk) , ztrds(jpi,jpj,jpk) ) 
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem)
          ztrds(:,:,:) = tsa(:,:,:,jp_sal)
@@ -276 +275 @@
          CALL trd_tra( kt, 'TRA', jp_tem, jptra_nsr, ztrdt )
          CALL trd_tra( kt, 'TRA', jp_sal, jptra_nsr, ztrds )
-         DEALLOCATE( ztrdt , ztrds ) 
       ENDIF
       !