Skip to content

Commit 4b862ea

Browse files
committed
Update test directory paths for Ames_sub1 tests
Modified `test_dir` and `ref_dir` variables to point to the new subdirectory structure (`Ames_sub1/SWIFT`). Updated the `add_test` command for `Ames_sub1` to ensure correct directory references for the test case. Rename program from SWAT+ to SWIFT in output Updated output messages to reflect the transition from the SWAT+ model to the SWIFT model. Changed version placeholders and program descriptions accordingly.
1 parent a0b631a commit 4b862ea

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,14 @@ find_package(Python3 REQUIRED)
142142

143143
set(spcheck "${PROJECT_SOURCE_DIR}/test/spcheck.py")
144144
set(exe_path "${PROJECT_BINARY_DIR}/${SWIFT_EXE}")
145-
set(test_dir "${PROJECT_BINARY_DIR}/data")
146-
set(ref_dir "${PROJECT_SOURCE_DIR}/data")
145+
set(test_dir "${PROJECT_BINARY_DIR}/data/Ames_sub1/SWIFT")
146+
set(ref_dir "${PROJECT_SOURCE_DIR}/data/Ames_sub1/SWIFT")
147147

148148
# error tolerances
149149
set(rerr "0.01")
150150
set(aerr "1e-8")
151151

152-
add_test(Ames_sub1 ${Python3_EXECUTABLE} ${spcheck} ctest ${exe_path} ${ref_dir}/Ames_sub1 ${test_dir} --abserr ${aerr} --relerr ${rerr})
152+
add_test(Ames_sub1 ${Python3_EXECUTABLE} ${spcheck} ctest ${exe_path} ${ref_dir} ${test_dir} --abserr ${aerr} --relerr ${rerr})
153153
# add_test(Ithaca_sub6 python3 ${check_py} ${exe_path} ${ref_dir}/Ithaca_sub6 ${test_dir} ${aerr} ${rerr})
154154

155155

src/main.f90.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
integer :: iob = 0
1010
integer, allocatable, dimension(:) :: cmd_next
1111

12-
prog = " SWAT+ @TODAY@ MODULAR Rev @YEAR@.@SWAT_VERSION@"
12+
prog = " SWIFT @TODAY@ MODULAR Rev @YEAR@.@SWIFT_VERSION@"
1313

1414
write (*,1000)
1515
open (9003,file='simulation.out')
1616
write (9003,1000)
17-
1000 format(1x," SWAT+ ",/, &
18-
& " Revision @SWAT_VERSION@ ",/, &
19-
& " Soil & Water Assessment Tool ",/, &
17+
1000 format(1x," SWIFT ",/, &
18+
& " Revision @SWIFT_VERSION@ ",/, &
19+
& " Soil and Water Integrated Flow Tool ",/, &
2020
& "@CMAKE_Fortran_COMPILER_ID@ (@CMAKE_Fortran_COMPILER_VERSION@), @ISO@, @CMAKE_HOST_SYSTEM_NAME@",/, &
2121
& " Program reading . . . executing",/)
2222

0 commit comments

Comments
 (0)