Changeset 4727 for LMDZ6/branches/LMDZ_ECRad/tools

Timestamp:

Oct 19, 2023, 4:02:57 PM (14 months ago)

Author:

idelkadi

Message:

Merged trunk changes -r4488:4726 LMDZ_ECRad branch

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

• . (modified) (1 prop)
• tools/Max_diff_nc_with_lib (deleted)
• tools/compare_real.py (modified) (1 diff)
• tools/diffdef.sh (modified) (6 diffs)

LMDZ6/branches/LMDZ_ECRad/tools/compare_real.py

@@ +1 @@
+#!/usr/bin/env python3
+
 """This script should be called by "diffdef.sh". It operates on
-different lines with common variables. It requires version 2.7 or
-higher of Python (it also works with Python 3).
+different lines with common variables.
 
 Author: Lionel GUEZ"""

LMDZ6/branches/LMDZ_ECRad/tools/diffdef.sh

@@ -2 +2 @@
 # Author: Lionel GUEZ
 
-# This script compares files "*.def" other than "*traceur.def" and
-# "out.def" in two directories.
+# This script compares files "*.def" other than "traceur.def",
+# "tracer.def", "isotopes_params.def" and "out.def" in two directories.
 
 # This script uses GNU versions of the utilities cut, sort and uniq,
@@ -9 +9 @@
 
 # See guide:
-# http://lmdz.lmd.jussieu.fr/utilisateurs/outils/utilisation-de-lmdz#section-5
+# http://lmdz.lmd.jussieu.fr/utilisateurs/utilisation-de-lmdz#section-5
 
 USAGE="usage: `basename $0` directory_1 directory_2"
 
 if (($# != 2))
-    then
+then
     echo "$USAGE" >&2
     exit 1
@@ -20 +20 @@
 
 ##set -x
-
-type python3 >/dev/null 2>&1
-if (($? == 0))
-then
-    my_python=python3
-else
-    my_python=python
-fi
-
 set -e
 
@@ -40 +31 @@
 
 for my_directory in $*
-  do
-  cd $my_directory
-  rm -f all.def
-  echo "def files in $my_directory:"
-  ls !(*traceur|out).def
+do
+    cd $my_directory
+    rm -f all.def
+    echo "def files in $my_directory:"
+    ls !(traceur|tracer|out|isotopes_params).def
 
-  # Concatenate and format the def files:
-  cat !(*traceur|out).def | tr '\r' '\n' | tr -d " " \
-      | grep -v -E '(^#|^!|INCLUDEDEF|^$)' \
-      | tr '[:lower:]' '[:upper:]' | sed 's/=[NF]$/=FALSE/' \
-      | sed 's/=[YT]$/=TRUE/' | sort >all.def
+    # Concatenate and format the def files:
+    cat !(traceur|tracer|out|isotopes_params).def | tr -d " \t" \
+        | grep -v -E '(^#|^!|INCLUDEDEF|^$)' \
+        | tr '[:lower:]' '[:upper:]' | sed 's/=[NF]$/=FALSE/' \
+        | sed 's/=[YT]$/=TRUE/' | sort >all.def
 
-  # Check that no variable is repeated:
-  cut --fields=1 --delimiter="=" all.def | uniq --repeated >plouf_$$
-  if [[ -s plouf_$$ ]]
-      then
-      echo
-      echo "Error: a variable is repeated in directory \"$my_directory\"."
-      echo
-      echo "Here is the list of repeated variables in directory \"$my_directory\":"
-      echo
-      cat plouf_$$
-      rm plouf_$$
-      rm all.def
-      exit 1
-  fi
-  rm plouf_$$
-
-  cd - >/dev/null
+    # Check that no variable is repeated:
+    
+    cut --fields=1 --delimiter="=" all.def | uniq --repeated >plouf_$$
+    
+    if [[ -s plouf_$$ ]]
+    then
+        echo
+        echo "Error: a variable is repeated in directory \"$my_directory\"."
+        echo
+        echo "Here is the list of repeated variables in directory " \
+             "\"$my_directory\":"
+        echo
+        cat plouf_$$
+        rm plouf_$$
+        rm all.def
+        exit 1
+    fi
+    
+    rm plouf_$$
+    cd - >/dev/null
 done
-
 
 sort $1/all.def $2/all.def | uniq --repeated >common_lines
 
 for my_directory in $*
-  do
-  sort $my_directory/all.def common_lines | uniq --unique \
-      >$my_directory/uniq_lines
+do
+    sort $my_directory/all.def common_lines | uniq --unique \
+                                                   >$my_directory/uniq_lines
 done
 
@@ -86 +79 @@
 
 for my_directory in $*
-  do
-  cd $my_directory
-  echo "Created file \"$my_directory/uniq_var\"."
-  sort uniq_lines uniq_var | uniq --unique >common_var
-  rm uniq_lines
-  cd - >/dev/null
+do
+    cd $my_directory
+    echo "Created file \"$my_directory/uniq_var\"."
+    sort uniq_lines uniq_var | uniq --unique >common_var
+    rm uniq_lines
+    cd - >/dev/null
 done
 
-$my_python $script_dir/compare_real.py $*
+$script_dir/compare_real.py $*
 sort common_lines --output=common_lines # was modified by the Python script
 echo "Created files \"./common_lines\" and \"./uniq_val\"."
@@ -100 +93 @@
 # Clean up:
 for my_directory in $*
-  do
+do
     rm $my_directory/common_var $my_directory/all.def
 done