Changeset 7680

Timestamp:

2017-02-14T13:06:22+01:00 (7 years ago)

Author:

frrh

Message:

Update all modified (and some existing) ALLOCATE statements to
use explicit range in dimensioning starting from 1, for
consistency and avoidance of doubt over dimensioning.

Location:

branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO

Files:

• OPA_SRC/SOL/solpcg.F90 (modified) (1 diff)
• OPA_SRC/TRA/traadv.F90 (modified) (2 diffs)
• OPA_SRC/TRA/traadv_tvd.F90 (modified) (3 diffs)
• OPA_SRC/TRA/traldf_iso.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcbbl.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcldf.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO/OPA_SRC/SOL/solpcg.F90

@@ -98 +98 @@
       IF( nn_timing == 1 )  CALL timing_start('sol_pcg')
       !
-      ALLOCATE( zgcr(jpi,jpj) )
+      ALLOCATE( zgcr(1:jpi,1:jpj) )
       !
       ! Initialization of the algorithm with standard PCG

branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

@@ -86 +86 @@
       IF( nn_timing == 1 )  CALL timing_start('tra_adv')
       !
-      ALLOCATE(zun(jpi, jpj, jpk))
-      ALLOCATE(zvn(jpi, jpj, jpk))
-      ALLOCATE(zwn(jpi, jpj, jpk))
+      ALLOCATE(zun(1:jpi, 1:jpj, 1:jpk))
+      ALLOCATE(zvn(1:jpi, 1:jpj, 1:jpk))
+      ALLOCATE(zwn(1:jpi, 1:jpj, 1:jpk))
       !                                          ! set time step
       IF( neuler == 0 .AND. kt == nit000 ) THEN     ! at nit000
@@ -126 +126 @@
       !
       IF( l_trdtra )   THEN                    !* Save ta and sa trends
-         ALLOCATE(ztrdt( jpi, jpj, jpk) )
-         ALLOCATE(ztrds( jpi, jpj, jpk) )
+         ALLOCATE(ztrdt( 1:jpi, 1:jpj, 1:jpk) )
+         ALLOCATE(ztrds( 1:jpi, 1:jpj, 1:jpk) )
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem)
          ztrds(:,:,:) = tsa(:,:,:,jp_sal)

branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -369 +369 @@
       IF( nn_timing == 1 )  CALL timing_start('tra_adv_tvd_zts')
       !
-      ALLOCATE(zwx_sav(jpi, jpj))
-      ALLOCATE(zwy_sav(jpi, jpj))
-      ALLOCATE(zwi(jpi, jpj, jpk))
-      ALLOCATE(zwz(jpi, jpj, jpk))        
-      ALLOCATE(zhdiv(jpi, jpj, jpk))       
-      ALLOCATE(zwz_sav(jpi, jpj, jpk))       
-      ALLOCATE(zwzts(jpi, jpj, jpk)) 
-      ALLOCATE(ztrs(jpi, jpj, jpk, kjpt+1))
+      ALLOCATE(zwx_sav(1:jpi, 1:jpj))
+      ALLOCATE(zwy_sav(1:jpi, 1:jpj))
+      ALLOCATE(zwi(1:jpi, 1:jpj, 1:jpk))
+      ALLOCATE(zwz(1:jpi, 1:jpj, 1:jpk))        
+      ALLOCATE(zhdiv(1:jpi, 1:jpj, 1:jpk))       
+      ALLOCATE(zwz_sav(1:jpi, 1:jpj, 1:jpk))       
+      ALLOCATE(zwzts(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE(ztrs(1:jpi, 1:jpj, 1:jpk, 1:kjpt+1))
       !
       IF( kt == kit000 )  THEN
@@ -388 +388 @@
       !
       IF( l_trd )  THEN
-         ALLOCATE(ztrdx(jpi, jpj, jpk))       
-         ALLOCATE(ztrdy(jpi, jpj, jpk))       
-         ALLOCATE(ztrdz(jpi, jpj, jpk))       
+         ALLOCATE(ztrdx(1:jpi, 1:jpj, 1:jpk))       
+         ALLOCATE(ztrdy(1:jpi, 1:jpj, 1:jpk))       
+         ALLOCATE(ztrdz(1:jpi, 1:jpj, 1:jpk))       
          ztrdx(:,:,:) = 0._wp  ;    ztrdy(:,:,:) = 0._wp  ;   ztrdz(:,:,:) = 0._wp
       ENDIF
       !
       IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN  
-         ALLOCATE(zptry(jpi, jpj, jpk))       
+         ALLOCATE(zptry(1:jpi, 1:jpj, 1:jpk))       
          zptry(:,:,:) = 0._wp
       ENDIF
@@ -665 +665 @@
       IF( nn_timing == 1 )  CALL timing_start('nonosc')
       !
-      ALLOCATE(zbetup(jpi, jpj, jpk))
-      ALLOCATE(zbetdo(jpi, jpj, jpk))
-      ALLOCATE(zbup(jpi, jpj, jpk))
-      ALLOCATE(zbdo(jpi, jpj, jpk))
+      ALLOCATE(zbetup(1:jpi, 1:jpj, 1:jpk))
+      ALLOCATE(zbetdo(1:jpi, 1:jpj, 1:jpk))
+      ALLOCATE(zbup(1:jpi, 1:jpj, 1:jpk))
+      ALLOCATE(zbdo(1:jpi, 1:jpj, 1:jpk))
       !
       zbig  = 1.e+40_wp

branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90

@@ -117 +117 @@
       IF( nn_timing == 1 )  CALL timing_start('tra_ldf_iso')
       !
-      ALLOCATE( z2d(jpi, jpj)) 
-      ALLOCATE( zdit(jpi, jpj, jpk))
-      ALLOCATE( zdjt(jpi, jpj, jpk)) 
-      ALLOCATE( ztfw(jpi, jpj, jpk)) 
-      ALLOCATE( zdkt(jpi, jpj, jpk)) 
-      ALLOCATE( zdk1t(jpi, jpj, jpk)) 
-      ALLOCATE( ztrax(jpi,jpj,jpk), ztray(jpi,jpj,jpk), ztraz(jpi,jpj,jpk) ) 
-      IF( l_trdtra .and. cdtype == 'TRA' ) ALLOCATE( ztrax_T(jpi,jpj,jpk), ztray_T(jpi,jpj,jpk), ztraz_T(jpi,jpj,jpk) ) 
+      ALLOCATE( z2d(1:jpi, 1:jpj)) 
+      ALLOCATE( zdit(1:jpi, 1:jpj, 1:jpk))
+      ALLOCATE( zdjt(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE( ztfw(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE( zdkt(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE( zdk1t(1:jpi, 1:jpj, 1:jpk)) 
+      ALLOCATE( ztrax(1:jpi,1:jpj,1:jpk)) 
+      ALLOCATE( ztray(1:jpi,1:jpj,1:jpk))
+      ALLOCATE( ztraz(1:jpi,1:jpj,1:jpk) ) 
+      IF( l_trdtra .and. cdtype == 'TRA' ) THEN
+         ALLOCATE( ztrax_T(1:jpi,1:jpj,1:jpk)) 
+         ALLOCATE( ztray_T(1:jpi,1:jpj,1:jpk)) 
+         ALLOCATE( ztraz_T(1:jpi,1:jpj,1:jpk)) 
+      ENDIF
       !
 

branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90

@@ -64 +64 @@
 
       IF( l_trdtrc )  THEN
-         ALLOCATE(ztrtrd( jpi, jpj, jpk, jptra )) ! temporary save of trends
+         ALLOCATE(ztrtrd( 1:jpi, 1:jpj, 1:jpk, 1:jptra )) ! temporary save of trends
          ztrtrd(:,:,:,:)  = tra(:,:,:,:)
       ENDIF

branches/UKMO/dev_r5518_optim_GO6_alloc/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90

@@ -81 +81 @@
       !
       IF( l_trdtrc )  THEN
-         ALLOCATE( ztrtrd ( jpi, jpj, jpk, jptra) )
+         ALLOCATE( ztrtrd ( 1:jpi, 1:jpj, 1:jpk, 1:jptra) )
          ztrtrd(:,:,:,:)  = tra(:,:,:,:)
       ENDIF