Changeset 14258 for NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/ICE/icedyn_adv_umx.F90

Timestamp:

2021-01-04T16:19:17+01:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2482: few changes to improve code on GPU

File:

• NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/ICE/icedyn_adv_umx.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/ICE/icedyn_adv_umx.F90

@@ -139 +139 @@
          ALLOCATE( zbetup(jpi,jpj,jpl), zbetdo(jpi,jpj,jpl), zti_ups(jpi,jpj,jpl), ztj_ups(jpi,jpj,jpl))
          ALLOCATE( zt_u(jpi,jpj,jpl), zt_v(jpi,jpj,jpl))
+         IF( ll_neg ) THEN
+            ALLOCATE( imsk_small(jpi,jpj,jpl) )
+            ALLOCATE( jmsk_small(jpi,jpj,jpl) )
+         ENDIF
+         IF( np_advS == 3 ) THEN
+            ALLOCATE( zuv_ho (jpi,jpj,jpl), zvv_ho (jpi,jpj,jpl),  &
+                      zuv_ups(jpi,jpj,jpl), zvv_ups(jpi,jpj,jpl), z1_vi(jpi,jpj,jpl), z1_vs(jpi,jpj,jpl) )
+         ENDIF
       ENDIF
       !
@@ -220 +228 @@
          ! setup a mask where advection will be upstream
          IF( ll_neg ) THEN
-            IF( .NOT. ALLOCATED(imsk_small) )   ALLOCATE( imsk_small(jpi,jpj,jpl) ) 
-            IF( .NOT. ALLOCATED(jmsk_small) )   ALLOCATE( jmsk_small(jpi,jpj,jpl) ) 
             DO jl = 1, jpl
                DO jj = 1, jpjm1