Skip to content

Commit

Permalink
Adding content from master to avoid conflicts.
Browse files Browse the repository at this point in the history 
Despite the content being the same, these files were committed
to both the Manhattan and master branches separately. That
is causing a conflict that prevents us from performing a clean
merge (or a ff merge) between the two branches.
  • Loading branch information
@timhoar
timhoar committed Oct 23, 2020
1 parent 220bc62 commit dcc14c6
Show file tree
Hide file tree
Showing 13 changed files with 1,459 additions and 181 deletions.
58 changes: 29 additions & 29 deletions assimilation_code/programs/run_tests.csh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
#
#----------------------------------------------------------------------

# prevent shell warning messages about no files found when trying
# to remove files using wildcards.
set nonomatch

set usingmpi=no
set MPICMD=""
set LOGDIR=`pwd`/testing_logs

if ( $#argv > 0 ) then
if ( "$argv[1]" == "-mpi" ) then
Expand Down Expand Up @@ -78,12 +81,22 @@ if ( ! $?host) then
setenv host `uname -n`
endif

echo
echo
echo "=================================================================="
echo "Starting tests of DART programs at "`date`
echo "=================================================================="
echo
echo
echo "Running DART programs test on $host"

#----------------------------------------------------------------------

set PARENTDIR = `pwd`

set LOGDIR=`pwd`/testing_logs
mkdir -p $LOGDIR
\rm -f $LOGDIR/*
echo "build and run logs are in: $LOGDIR"

# set the list of programs to include here

# FIXME: note that an important set of programs has no testing done
Expand Down Expand Up @@ -122,28 +135,15 @@ set DO_THESE_DIRECTORIES = ( \
# Compile all executables for each directory.
#----------------------------------------------------------------------

echo
echo
echo "=================================================================="
echo "Starting tests of dart programs at "`date`
echo "=================================================================="
echo
echo

mkdir -p $LOGDIR
\rm -f $LOGDIR/*
echo "build and run logs are in: $LOGDIR"


@ counter = 0

foreach PROGRAMDIRECTORY ( $DO_THESE_DIRECTORIES )

echo
echo
echo "=================================================================="
echo "------------------------------------------------------------------"
echo "Compiling $PROGRAMDIRECTORY starting at "`date`
echo "=================================================================="
echo "------------------------------------------------------------------"
echo
echo

Expand All @@ -158,8 +158,8 @@ foreach PROGRAMDIRECTORY ( $DO_THESE_DIRECTORIES )
echo
echo
if ( $FAILURE ) then
echo "=================================================================="
echo "ERROR - unsuccessful build of $PROGRAMDIRECTORY at "`date`
echo "------------------------------------------------------------------"
echo "ERROR - unsuccessful build of $PROGRAMDIRECTORY"
switch ( $PROGRAMDIRECTORY )
case system_simulation
echo "obs_sampling_err.f90 build expected to fail if running in reduced precision"
Expand All @@ -171,14 +171,14 @@ foreach PROGRAMDIRECTORY ( $DO_THESE_DIRECTORIES )
echo "unexpected error"
breaksw
endsw
echo "=================================================================="
echo "------------------------------------------------------------------"
echo
echo
continue
else
echo "=================================================================="
echo "End of successful build of $PROGRAMDIRECTORY at "`date`
echo "=================================================================="
echo "------------------------------------------------------------------"
echo "End of successful build of $PROGRAMDIRECTORY"
echo "------------------------------------------------------------------"
echo
echo

Expand All @@ -187,7 +187,7 @@ foreach PROGRAMDIRECTORY ( $DO_THESE_DIRECTORIES )
# echo
# echo
# echo "=================================================================="
# echo "Running tests for $PROGRAMDIRECTORY starting at "`date`
# echo "Running tests for $PROGRAMDIRECTORY"
# echo "=================================================================="
# echo
# echo
Expand All @@ -202,9 +202,9 @@ foreach PROGRAMDIRECTORY ( $DO_THESE_DIRECTORIES )
# echo "++++++++++++++++++"
# echo Starting $PROG
# if ( -f using_mpi_for_$PROG ) then
# ( ${MPICMD} ./$PROG > ${LOGDIR}/runlog.$PROG.out ) || set FAILURE = 1
# ( ${MPICMD} ./$PROG > ${LOGDIR}/runlog.$PROGRAMDIRECTORY.$PROG.out ) || set FAILURE = 1
# else
# ( ./$PROG > ${LOGDIR}/runlog.$PROG.out ) || set FAILURE = 1
# ( ./$PROG > ${LOGDIR}/runlog.$PROGRAMDIRECTORY.$PROG.out ) || set FAILURE = 1
# endif
# echo Finished $PROG
# echo "++++++++++++++++++"
Expand All @@ -217,7 +217,7 @@ foreach PROGRAMDIRECTORY ( $DO_THESE_DIRECTORIES )
# echo
# echo
# echo "=================================================================="
# echo "Done with tests of $PROGRAMDIRECTORY at "`date`
# echo "Done with tests of $PROGRAMDIRECTORY"
# echo "=================================================================="
# echo
# echo
Expand All @@ -234,7 +234,7 @@ echo
echo
echo
echo "=================================================================="
echo "Ending tests of dart programs at "`date`
echo "End of DART program tests at "`date`
echo "=================================================================="
echo
echo
Expand Down
93 changes: 49 additions & 44 deletions developer_tests/location/run_tests.csh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,79 +3,84 @@
# DART software - Copyright UCAR. This open source software is provided
# by UCAR, "as is", without charge, subject to all terms of use at
# http://www.image.ucar.edu/DAReS/DART/DART_download

#
# this script builds and runs the location test code for each of the
# possible location modules.
#
#----------------------------------------------------------------------

set LOGDIR = `pwd`/testing_logs
mkdir -p $LOGDIR
\rm -f $LOGDIR/*
echo "build and run logs are in: $LOGDIR"
# prevent shell warning messages about no files found when trying
# to remove files using wildcards.

set nonomatch

echo
echo
echo "=================================================================="
echo "Starting location module tests at "`date`
echo "Start of location module tests at "`date`
echo "=================================================================="
echo
echo

set LOGDIR = `pwd`/testing_logs
mkdir -p $LOGDIR
\rm -f $LOGDIR/*
echo "build and run logs are in: $LOGDIR"

set LOCLIST = ( annulus channel column oned threed \
threed_cartesian threed_sphere \
twod twod_annulus twod_sphere )

foreach i ( $LOCLIST )

echo
echo
echo "=================================================================="
echo "Starting tests of location module $i at "`date`
echo "=================================================================="
echo
echo

set FAILURE = 0

cd $i/test

./mkmf_location_test
( make > $LOGDIR/buildlog.$i.out ) || set FAILURE = 1

echo
echo
if ( $FAILURE ) then
echo "=================================================================="
echo "ERROR - unsuccessful build of location module $i at "`date`
echo "=================================================================="
echo
echo
else
echo "------------------------------------------------------------------"
echo "Starting tests of location module $i at "`date`
echo "------------------------------------------------------------------"
echo
echo

set FAILURE = 0

ls -l location_test
( ./location_test < test.in > $LOGDIR/runlog.$i.out ) || set FAILURE = 1
cd $i/test

./mkmf_location_test
( make > $LOGDIR/buildlog.$i.out ) || set FAILURE = 1

echo
echo
if ( $FAILURE ) then
echo "=================================================================="
echo "ERROR - unsuccessful run of location module $i tests at "`date`
echo "=================================================================="
echo "------------------------------------------------------------------"
echo "ERROR - unsuccessful build of location module $i at "`date`
echo "------------------------------------------------------------------"
echo
echo
else
echo "=================================================================="
echo "Tests of location module $i complete at "`date`
echo "=================================================================="
endif
echo
echo

\rm -f *.o *.mod input.nml*_default dart_log.* \
Makefile location_test_file* location_test

endif
ls -l location_test
( ./location_test < test.in > $LOGDIR/runlog.$i.out ) || set FAILURE = 1

echo
echo
if ( $FAILURE ) then
echo "------------------------------------------------------------------"
echo "ERROR - unsuccessful run of location module $i tests at "`date`
echo "------------------------------------------------------------------"
else
echo "------------------------------------------------------------------"
echo "Tests of location module $i complete at "`date`
echo "------------------------------------------------------------------"
endif
echo
echo

\rm -f *.o *.mod input.nml*_default dart_log.* \
Makefile location_test_file* location_test

endif

cd ../..
cd ../..
end

echo
Expand Down
Loading

0 comments on commit dcc14c6

Please sign in to comment.