Changeset 1604 for LMDZ5/trunk/libf/grid/dimension/makdim

Timestamp:

Dec 22, 2011, 12:26:02 PM (12 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.

File:

• LMDZ5/trunk/libf/grid/dimension/makdim (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 )