Changeset 1879

Timestamp:

09/13/12 18:35:26 (12 years ago)

Author:

aclsce

Message:

Modified to exclude good variables

Location:

TOOLS/PACK_IPSL

Files:

• check_ncrcat_list.sh (modified) (2 diffs)
• diff.bash (modified) (4 diffs)

TOOLS/PACK_IPSL/check_ncrcat_list.sh

@@ -1 +1 @@
 #!/bin/bash
-
+set -vx
 listToProcessFile="${1}"
 # exemple de fichier liste :
@@ -89 +89 @@
 echo >> $output_cdocat_logFile
 
-vartoexclude="'t_inst*,contfracATM,sobowlin'"
+vartoexclude="t_inst*,contfracATM,sobowlin,Contfrac"
 ./diff.bash $output_ncrcat_file $output_cdocat_file $vartoexclude >> $output_cdocat_logFile
 

TOOLS/PACK_IPSL/diff.bash

@@ -1 +1 @@
 #!/bin/bash
-
+set -vx
 #==============================================
 #
@@ -17 +17 @@
 fi
 
-cdo -s diff $1 $delname $2 > diff_$$.tmp 2>&1
+cdo -s $delname $1 out_tmp1.nc
+cdo -s $delname $2 out_tmp2.nc
+
+cdo -s diff out_tmp1.nc out_tmp2.nc > diff_$$.tmp 2>&1
 result2=`cat diff_$$.tmp | grep -i "records differ" | tr -s " " | cut -f2 -d" "`
 
@@ -26 +29 @@
         echo "$2" 
         echo "are the same"
-        rm -f diff_$$.tmp
+        rm -f diff_$$.tmp out_tmp1.nc out_tmp2.nc
         exit 0
 else
@@ -35 +38 @@
         echo "differ"   
         cat diff_$$.tmp | grep -i "records differ"
-        rm -f diff_$$.tmp
+        rm -f diff_$$.tmp out_tmp1.nc out_tmp2.nc
         echo "==============> ERROR"
         exit 1