Changeset 1629

Timestamp:

2009-09-10T11:59:38+02:00 (15 years ago)

Author:

rblod

Message:

Agrif compilation for nemo_v3_2_beta, see ticket #544

Location:

trunk/NEMO/OPA_SRC

Files:

• DOM/domzgr.F90 (modified) (2 diffs)
• lib_mpp.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1083 +1083 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   zri , zrj , zhbat   !  -     -
       !!
-!!gm never do that !!!!   ==> Pb at compilation phase on several computer
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigw3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigt3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsi3w3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigt3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigw3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtu3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtv3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtf3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigwu3 = 0.0d0
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigwv3 = 0.0d0
-!!gm end
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigw3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigt3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsi3w3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigt3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigw3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtu3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtv3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigtf3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigwu3
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigwv3
       !!
       NAMELIST/namzgr_sco/ rn_sbot_max, rn_sbot_min, rn_theta, rn_thetb, rn_rmax, ln_s_sigma, rn_bb, rn_hc
@@ -1117 +1115 @@
          WRITE(numout,*) '      Critical depth                               rn_hc         = ', rn_hc
       ENDIF
+
+      gsigw3  = 0.0d0   ;   gsigt3  = 0.0d0   ; gsi3w3 = 0.0d0
+      esigt3  = 0.0d0   ;   esigw3  = 0.0d0 
+      esigtu3 = 0.0d0   ;   esigtv3 = 0.0d0   ; esigtf3 = 0.0d0
+      esigwu3 = 0.0d0   ;   esigwv3 = 0.0d0
 
       hift(:,:) = rn_sbot_min                     ! set the minimum depth for the s-coordinate

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -102 +102 @@
    !!  MPI  variable definition !!
    !! ========================= !!
-   !$AGRIF_DO_NOT_TREAT
+!$AGRIF_DO_NOT_TREAT
 #  include <mpif.h>
-   !$AGRIF_END_DO_NOT_TREAT
+!$AGRIF_END_DO_NOT_TREAT
    
    LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .TRUE.    !: mpp flag