Changeset 1076

Timestamp:

Oct 18, 2013, 5:41:47 PM (11 years ago)

Author:

slebonnois

Message:

SL: still another correction to version 1056...

Location:

trunk/LMDZ.COMMON

Files:

• libf/dyn3d/calfis.F (modified) (1 diff)
• libf/dyn3dpar/calfis_p.F (modified) (3 diffs)
• makelmdz (modified) (3 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/calfis.F

@@ -195 +195 @@
 ! to allow for 2D computation of microphys and chemistry
       LOGICAL,save :: flag_moyzon
-      REAL,allocatable :: tmpvar(:,:)
-      REAL,allocatable :: tmpvarp1(:,:)
-      REAL,allocatable :: tmpvarbar(:)
-      REAL,allocatable :: tmpvarbarp1(:)
+      REAL,allocatable,save :: tmpvar(:,:)
+      REAL,allocatable,save :: tmpvarp1(:,:)
+      REAL,allocatable,save :: tmpvarbar(:)
+      REAL,allocatable,save :: tmpvarbarp1(:)
 
 c-----------------------------------------------------------------------

trunk/LMDZ.COMMON/libf/dyn3dpar/calfis_p.F

@@ -256 +256 @@
 ! to allow for 2D computation of microphys and chemistry
       LOGICAL,save :: flag_moyzon
-      REAL,allocatable :: tmpvar(:,:)
-      REAL,allocatable :: tmpvarp1(:,:)
-      REAL,allocatable :: tmpvarbar(:)
-      REAL,allocatable :: tmpvarbarp1(:)
+      REAL,allocatable,save :: tmpvar(:,:)
+      REAL,allocatable,save :: tmpvarp1(:,:)
+      REAL,allocatable,save :: tmpvarbar(:)
+      REAL,allocatable,save :: tmpvarbarp1(:)
 
 c-----------------------------------------------------------------------
@@ -284 +284 @@
         unskap   = 1./ kappa
 
+c$OMP MASTER
         flag_moyzon = .false.
         if(moyzon_ch.or.moyzon_mu) then
@@ -293 +294 @@
         endif
 
-c$OMP MASTER
       ALLOCATE(zpsrf(klon))
       ALLOCATE(zplev(klon,llm+1),zplay(klon,llm))

trunk/LMDZ.COMMON/makelmdz

@@ -323 +323 @@
    archfileline=$( grep -i '^%C_OPTIM' arch.fcm )
    coptim=$( echo ${archfileline##%C_OPTIM} )
-   OPTIMC="$OPTIMC  ${coptim}"
+   OPTIMC="${coptim}"
    INCLUDEC='-I$(LIBF)/grid -I.'
 fi
@@ -732 +732 @@
 OPTIMTRU90="${COMPIL_FFLAGS} ${PARA_FFLAGS}" \
 OPTIM="${COMPIL_FFLAGS} ${PARA_FFLAGS}" \
-OPTIMC="$optimc" \
+OPTIMC="$OPTIMC" \
 INCLUDE="$INCLUDE" \
 INCLUDEC="$includec" \
@@ -763 +763 @@
 OPTIMTRU90="${COMPIL_FFLAGS} ${PARA_FFLAGS}" \
 OPTIM="${COMPIL_FFLAGS} ${PARA_FFLAGS}" \
-OPTIMC="$optimc" \
+OPTIMC="$OPTIMC" \
 INCLUDE="$INCLUDE" \
 INCLUDEC="$includec" \