diff --git a/regtests/bin/matrix_cmake_datarmor b/regtests/bin/matrix_cmake_datarmor index f8ffaaa63..a197d3a03 100755 --- a/regtests/bin/matrix_cmake_datarmor +++ b/regtests/bin/matrix_cmake_datarmor @@ -27,7 +27,7 @@ usage () { cat 2>&1 << EOF -Usage: $myname model_dir +Usage: $myname model_dir Required: model_dir : path to model dir of WW3 source EOF @@ -51,7 +51,7 @@ main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`" # 1. Set up - + export np='28' #number of mpi tasks export npl='28' #number of mpi tasks for ufs applications and large setups export npl1='20' #number of mpi tasks for ufs/large setups (b4b check) @@ -151,9 +151,10 @@ main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`" export shwtr='y' # shallow water tests export unstr='y' # unstructured grid tests export pdlib='y' # unstr with pdlib for domain decomposition and implicit solver + export lmp='y' # Langmuir mixing parameterization export smcgr='y' # SMC grid test export rtd='y' # Rotated pole test - export mudice='y' # Mud/Ice and wave interaction tests + export mudice='y' # Mud/Ice and wave interaction tests export infgrv='y' # Second harmonic generation tests export uost='y' # ww3_ts4 Unresolved Obstacles Source Term (UOST) export assim='y' # Restart spectra update @@ -178,17 +179,17 @@ main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`" export nth_b4b='y' # Thread Reproducibility export esmf='n' # ESMF coupling # export filter='PR3 ST2 UQ' - # The filter does a set of consecutive greps on the + # The filter does a set of consecutive greps on the # command lines generated by filter.base with the above # selected options. # --------------------------------------------------------------------------- # # 2. Execute matrix.base ... # # --------------------------------------------------------------------------- # - + $main_dir/../regtests/bin/matrix.base - $main_dir/../regtests/bin/matrix_divider_cmake.sh + $main_dir/../regtests/bin/matrix_divider_cmake.sh # --------------------------------------------------------------------------- # # End to the matrix # diff --git a/regtests/bin/matrix_cmake_milhydro b/regtests/bin/matrix_cmake_milhydro index 8213b9b33..6be47ab24 100755 --- a/regtests/bin/matrix_cmake_milhydro +++ b/regtests/bin/matrix_cmake_milhydro @@ -19,10 +19,10 @@ # # # --------------------------------------------------------------------------- # usage () -{ +{ cat 2>&1 << EOF - Usage: $myname model_dir + Usage: $myname model_dir Required: model_dir : path to model dir of WW3 source EOF @@ -41,7 +41,7 @@ EOF # Convert main_dir to absolute path main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`" -# Set batchq queue, choose modules and other custom variables to fit system and +# Set batchq queue, choose modules and other custom variables to fit system and # to define headers etc (default to original version if empty) # 1. Set up # 1.a Computer/ user dependent set up @@ -58,7 +58,7 @@ EOF echo " export path_build_root=$(dirname $main_dir)/regtests/buildmatrix" >> matrix.head echo ' [[ -d ${path_build_root} ]] && rm -rf ${path_build_root}' >> matrix.head - echo ' ' + echo ' ' if [ "$batchq" = 'slurm' ] then @@ -97,9 +97,10 @@ echo " export path_build_root=$(dirname $main_dir)/regtests/buildmatrix" >> mat export shwtr='y' # shallow water tests export unstr='y' # unstructured grid tests export pdlib='y' # unstr with pdlib for domain decomposition and implicit solver + export lmp='y' # Langmuir mixing parameterization export smcgr='y' # SMC grid test export rtd='y' # Rotated pole test - export mudice='y' # Mud/Ice and wave interaction tests + export mudice='y' # Mud/Ice and wave interaction tests export infgrv='y' # Second harmonic generation tests export uost='y' # ww3_ts4 Unresolved Obstacles Source Term (UOST) export assim='y' # Restart spectra update @@ -124,14 +125,14 @@ echo " export path_build_root=$(dirname $main_dir)/regtests/buildmatrix" >> mat export npl_b4b='n' # MPI task Reproducibility export nth_b4b='n' # Thread Reproducibility export esmf='n' # ESMF coupling - # The filter does a set of consecutinve greps on the + # The filter does a set of consecutinve greps on the # command lines generated by filter.base with the above # selected options. # --------------------------------------------------------------------------- # # 2. Execute matrix.base ... # # --------------------------------------------------------------------------- # - + $main_dir/../regtests/bin/matrix.base @@ -146,7 +147,7 @@ echo " export path_build_root=$(dirname $main_dir)/regtests/buildmatrix" >> mat do echo "sbatch < $file" >> msuball.sh done - fi + fi # --------------------------------------------------------------------------- # # End to the matrix # diff --git a/regtests/bin/matrix_cmake_ukmo_cray b/regtests/bin/matrix_cmake_ukmo_cray index fc6cf64b9..a4df5da0a 100755 --- a/regtests/bin/matrix_cmake_ukmo_cray +++ b/regtests/bin/matrix_cmake_ukmo_cray @@ -29,7 +29,7 @@ usage () { cat 2>&1 << EOF - Usage: $myname model_dir + Usage: $myname model_dir Required: model_dir : path to model dir of WW3 source EOF @@ -139,14 +139,15 @@ fi export shwtr='y' # shallow water tests export unstr='y' # unstructured grid tests export pdlib='y' # unstr with pdlib for domain decomposition and implicit solver + export lmp='y' # Langmuir mixing parameterization export smcgr='y' # SMC grid test export rtd='y' # Rotated pole test - export mudice='y' # Mud/Ice and wave interaction tests + export mudice='y' # Mud/Ice and wave interaction tests export infgrv='y' # Second harmonic generation tests export uost='y' # ww3_ts4 Unresolved Obstacles Source Term (UOST) export assim='y' # Restart spectra update export oasis='y' # Atmosphere, ocean, and ice coupling using oasis - export calendar='y' # Calendar type + export calendar='y' # Calendar type export confignc='y' # Configurable netCDF meta data (ww3_ounf) export multi01='y' # mww3_test_01 (wetting and drying) @@ -166,14 +167,14 @@ fi export nth_b4b='y' # Thread Reproducibility export esmf='n' # ESMF coupling # export filter='PR3 ST2 UQ' - # The filter does a set of consecutinve greps on the + # The filter does a set of consecutinve greps on the # command lines generated by filter.base with the above # selected options. # --------------------------------------------------------------------------- # # 2. Execute matrix.base ... # # --------------------------------------------------------------------------- # - + $main_dir/../regtests/bin/matrix.base $main_dir/../regtests/bin/matrix_divider_cmake.sh