Changeset 3209 for branches

Timestamp:

2011-12-10T09:04:49+01:00 (12 years ago)

Author:

smasson

Message:

dev_NEMO_MERGE_2011: syntaxe change to dynamical allocation, see ticket #896

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/divcur.F90 (modified) (1 diff)
• LDF/ldfslp.F90 (modified) (1 diff)
• SBC/albedo.F90 (modified) (1 diff)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90

@@ -88 +88 @@
       INTEGER ::   ii, ij, ijt, iju, ierr   ! local integer
       REAL(wp) ::  zraur, zdep              ! local scalar
-      REAL(wp), POINTER,  DIMENSION(:,:) ::   zwu, zwv   ! specific 2D workspace
+      REAL(wp), POINTER,  DIMENSION(:,:) ::   zwu   ! specific 2D workspace
+      REAL(wp), POINTER,  DIMENSION(:,:) ::   zwv   ! specific 2D workspace
       !!----------------------------------------------------------------------
       !

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -109 +109 @@
       REAL(wp) ::   zcj, zfj, zav, zbv, zaj, zbj   !   -      -
       REAL(wp) ::   zck, zfk,      zbw             !   -      -
-      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zgru, zgrv, zdzr
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zdzr
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zgru, zgrv
       !!----------------------------------------------------------------------
 

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90

@@ -89 +89 @@
       ijpl = SIZE( pt_ice, 3 )                     ! number of ice categories
 
-      CALL wrk_alloc( jpi,jpj,SIZE( pt_ice, 3 ), zalbfz, zficeth )
+      CALL wrk_alloc( jpi,jpj,ijpl, zalbfz, zficeth )
 
       IF( albd_init == 0 )   CALL albedo_init      ! initialization