Changeset 2101

Timestamp:

Jul 24, 2014, 6:26:10 PM (10 years ago)

Author:

lguez

Message:

Exclude "out.def" of the comparison of ".def" files with
diffdef. "out.def" is neither an input file neither a file written by
IOIPSL like the files "used_*.def". So "out.def" contains some
duplicate lines with "used_guide.def", and the script diffdef would
signal that as an error.

Location:

LMDZ5/trunk

Files:

• libf/phylmd/calbeta_clim.F90 (modified) (2 diffs)
• tools/diffdef.sh (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/calbeta_clim.F90

@@ -23 +23 @@
   real lat_sahel,beta(klon)
   real lat_nord,lat_sud
+
+  include "iniprint.h"
   !==============================================
 
@@ -33 +35 @@
   time_radian=(time+15.)*2.*pi / year_len
 
-  print*,'BETA time_radian',time_radian,time
+  if (prt_level >= 1) print *, 'time_radian time', time_radian, time
 
   lat(:)=180.*lat_radian(:)/pi !lat(:)=lat_radian(:)

LMDZ5/trunk/tools/diffdef.sh

@@ -2 +2 @@
 # Author: Lionel GUEZ
 
-# This script compares files "*.def" other than "traceur.def" in two
-# directories. The script uses GNU versions of the utilities cut, sort
-# and uniq.
+# This script compares files "*.def" other than "traceur.def" and
+# "out.def" in two directories. The script uses GNU versions of the
+# utilities cut, sort and uniq.
 
 # See guide:
@@ -33 +33 @@
   rm -f all.def
   echo "def files in $my_directory:"
-  ls !(traceur).def
+  ls !(traceur|out).def
 
   # Concatenate and format the def files:
-  cat !(traceur).def | tr -d " " | grep -v -E '(^#|^!|INCLUDEDEF|^$)' \
-      | tr '[:lower:]' '[:upper:]' | sed 's/=N$/=FALSE/' | sed 's/=Y$/=TRUE/' \
-      | sort >all.def
+  cat !(traceur|out).def | tr -d " " | grep -v -E '(^#|^!|INCLUDEDEF|^$)' \
+      | tr '[:lower:]' '[:upper:]' | sed 's/=[NF]$/=FALSE/' \
+      | sed 's/=[YT]$/=TRUE/' | sort >all.def
 
   # Check that no variable is repeated: