Skip to content

update matrix.comp and run_test #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mickaelaccensi merged 2 commits into from
Feb 15, 2022
Merged

update matrix.comp and run_test #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84725ed
update matrix.comp and run_test to get clean comparisons
JessicaMeixner-NOAA Feb 15, 2022
c30d4d3
update with Mickael's suggestion
JessicaMeixner-NOAA Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 44 additions & 25 deletions regtests/bin/matrix.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -e
# --------------------------------------------------------------------------- #
# matrix.comp Compare output of matrix for two model versions. #
# #
Expand Down Expand Up @@ -111,13 +111,7 @@
# 3. Looping over work directories #
# --------------------------------------------------------------------------- #

cases=$(find . -maxdepth 1 -type d -name "work*" | grep -v work_oasis)
# skip to next tst if no work directory
echo 'run : ' $cases
if [ -z "$cases" ] ; then
echo "skip"
continue
fi
cases=$(find . -maxdepth 1 -type d -name "work*" )

for run in $cases
do
Expand Down Expand Up @@ -153,20 +147,58 @@

cd $return_base ; cd $run
rm -f diff_tempfile
files_1=`find -type f | sed "s#^./##"`

files_0=`ls`
files_1=""
for file in $files_0
do
if [[ -d $file ]]; then
if [[ $file == build* ]] || [[ $file == exe* ]] ||
[[ $file == *oasis3-mct* ]] || [[ $file == toy* ]]; then
echo "do not compare build or exe directories $file"
else
#add files:
files_dir=`ls $file`
for file1 in $files_dir
do
files_1="$files_1 $file1"
done
fi
else
files_1="$files_1 $file"
fi
done

#Generate list of binary files in the directory
binaryfiles=`grep . -r * | grep 'Binary file' | sed -e "s/^Binary file //" -e "s/ matches$//"`

#Generate list of files to skip
skipfiles="ww3_shel.out ww3_multi.out prf.*.mww3 finished ww3_systrk.out gmon.out time_count.txt oasis_make.out oasis_clean.out toy_make.out toy_clean.out toy_model"
skipfiles="ww3_shel.out ww3_multi.out prf.*.mww3 finished ww3_systrk.out gmon.out time_count.txt oasis_make.out oasis_clean.out toy_model toy_make.out toy_clean.out build.log"

nf_1=`echo $files_1 | wc -w | awk '{print $1}'`
echo " found $nf_1 files in base directory" >> $home_dir/fulldiff.tmp

cd $return_comp ; cd $run
rm -f diff_tempfile
files_2=`find -type f | sed "s#^./##"`
files_0=`ls`
files_2=""
for file in $files_0
do
if [[ -d $file ]]; then
if [[ $file == build* ]] || [[ $file == exe* ]] ||
[[ $file == *oasis3-mct* ]] || [[ $file == toy* ]]; then
echo "do not compare build or exe directories $file"
else
#add files:
files_dir=`ls $file`
for file1 in $files_dir
do
files_2="$files_1 $file1"
done
fi
else
files_2="$files_2 $file"
fi
done

nf_2=`echo $files_2 | wc -w | awk '{print $1}'`
echo " found $nf_2 files in compare directory" >> $home_dir/fulldiff.tmp
Expand Down Expand Up @@ -402,19 +434,6 @@
rm -f $home_dir/summary.tmp
rm -f $home_dir/fulldiff.tmp


# echo ' '
# cat $home_dir/fulldiff.tmp
# echo '**********************************************************************'
#
# echo ' '
# cat $home_dir/isIdenticalList.tmp
# echo '**********************************************************************'
#
# echo ' '
# cat $home_dir/notIdenticalList.tmp
# echo '**********************************************************************'

echo ' '
echo " Saved summary to $home_dir/matrixCompSummary.txt"
echo " Saved full output to $home_dir/matrixCompFull.txt"
Expand Down
1 change: 1 addition & 0 deletions regtests/bin/run_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,6 +2090,7 @@ do
then
\rm -f $prog.inp
\rm -f $prog.nml
\rm -f ounfmeta.inp
if [ $multi -eq 2 ]
then
\rm -f mod_def.ww3
Expand Down