Changeset 2631 for branches/dev_r2586_dynamic_mem

Timestamp:

2011-02-28T12:19:28+01:00 (13 years ago)

Author:

trackstand2

Message:

geo2ocean - bug fix - missing ALLOCATABLE attribute and .NOT. on check on allocated status

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/geo2ocean.F90

@@ -36 +36 @@
       gsinf, gcosf       ! cos/sin between model grid lines and NP direction at F point
 
-   LOGICAL , SAVE, DIMENSION(4)     ::   linit = .FALSE.
-   REAL(wp), SAVE, DIMENSION(:,:,:) ::   gsinlon, gcoslon, gsinlat, gcoslat
+   LOGICAL ,              SAVE, DIMENSION(4)     ::   linit = .FALSE.
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   gsinlon, gcoslon, gsinlat, gcoslat
 
    LOGICAL ::   lmust_init = .TRUE.        !: used to initialize the cos/sin variables (se above)
@@ -355 +355 @@
       REAL(wp), PARAMETER :: rad = rpi / 180.e0
       INTEGER ::   ig     !
-      !!----------------------------------------------------------------------
-
-      IF( ALLOCATED( gsinlon ) ) THEN
+      INTEGER ::   ierr   ! local integer
+      !!----------------------------------------------------------------------
+
+      IF( .NOT. ALLOCATED( gsinlon ) ) THEN
          ALLOCATE( gsinlon(jpi,jpj,4) , gcoslon(jpi,jpj,4) ,   &
             &      gsinlat(jpi,jpj,4) , gcoslat(jpi,jpj,4) , STAT=ierr )
@@ -435 +436 @@
       REAL(wp), PARAMETER :: rad = rpi / 180.e0
       INTEGER ::   ig     !
+      INTEGER ::   ierr   ! local integer
       !!----------------------------------------------------------------------