Changeset 1604 for LMDZ5/trunk

Timestamp:

Dec 22, 2011, 12:26:02 PM (13 years ago)

Author:

lguez

Message:

Removed two "fi" with no corresponding "if" in "makdim".

In procedure "coefkz", when calculating cloud fraction "zfr", "zq" can
be zero at high altitude. Avoid division by zero, set "zfr" to 0 when
"zq" is 0.

In "physiq", allocatable arrays "tabijgcm", "longcm", "latgcm",
"igcm", "jgcm" cannot be arguments of "phys_output_open" if they have
not been allocated. Allocate them with zero size when
'npCFMIP_param.data' cannot be opened.

Location:

LMDZ5/trunk/libf

Files:

• grid/dimension/makdim (modified) (3 diffs)
• phylmd/coef_diff_turb_mod.F90 (modified) (1 diff)
• phylmd/physiq.F (modified) (3 diffs)

LMDZ5/trunk/libf/grid/dimension/makdim

@@ -1 @@
-for i in $* ; do
-   list=$list.$i
+for i in $*
+  do
+  list=$list.$i
 done
 fichdim=dimensions${list}
 
-if [ ! -f $fichdim ] ; then
+if [ ! -f $fichdim ]
+    then
 # si le fichier de dimensions n'existe pas, on le cree
 
-  if [ $# -ge 3 ] ; then
-     im=$1
-     jm=$2
-     lm=$3
-     n2=$1
-     ndm=1
+    if [ $# -ge 3 ]
+        then
+        im=$1
+        jm=$2
+        lm=$3
+        n2=$1
+        ndm=1
 
 # Le test suivant est commente car il est inutile avec le nouveau 
@@ -28 +31 @@
 
 
-  else if [ $# -ge 2 ] ; then
-      im=1
-      jm=$1
-      lm=$2
-      ndm=1
-  else if [ $# -ge 1 ] ; then
-      im=1
-      jm=1
-      lm=$1
-      ndm=1
-  else
-         echo il faut au moins une dimension
-         exit
-  fi
-fi
+    else if [ $# -ge 2 ]
+        then
+        im=1
+        jm=$1
+        lm=$2
+        ndm=1
+    else if [ $# -ge 1 ]
+        then
+        im=1
+        jm=1
+        lm=$1
+        ndm=1
+    else
+        echo il faut au moins une dimension
+        exit
+    fi
 fi
 
@@ -60 +64 @@
 EOF
 
-fi
-
 \rm ../dimensions.h
 tar cf - $fichdim | ( cd .. ; tar xf - ; mv $fichdim dimensions.h )

LMDZ5/trunk/libf/phylmd/coef_diff_turb_mod.F90

@@ -389 +389 @@
 !           calculer la fraction nuageuse (processus humide):
 !
-          zfr = (zq+ratqs*zq-zqs) / (2.0*ratqs*zq)
+          if (zq /= 0.) then
+             zfr = (zq+ratqs*zq-zqs) / (2.0*ratqs*zq)
+          else
+             zfr = 0.
+          end if
           zfr = MAX(0.0,MIN(1.0,zfr))
           IF (.NOT.richum) zfr = 0.0

LMDZ5/trunk/libf/phylmd/physiq.F

@@ -1220 +1220 @@
       INTEGER :: nbtr_tmp ! Number of tracer inside concvl
       REAL, dimension(klon,klev) :: sh_in ! Specific humidity entering in phytrac
+      integer iostat
 
 cIM for NMC files
@@ -1508 +1509 @@
       nCFMIP=npCFMIP
       OPEN(98,file='npCFMIP_param.data',status='old',
-     $          form='formatted',err=999)
+     $          form='formatted',iostat=iostat)
+            if (iostat == 0) then
       READ(98,*,end=998) nCFMIP
 998   CONTINUE
@@ -1540 +1542 @@
      $tabijGCM, lonGCM, latGCM, iGCM, jGCM)
 c
-999      CONTINUE
+            else
+               ALLOCATE(tabijGCM(0))
+               ALLOCATE(lonGCM(0), latGCM(0))
+               ALLOCATE(iGCM(0), jGCM(0))
+            end if
          ENDIF !debut