Skip to content

Commit

Permalink
Conditionally skip tests that depend on the UMFPACK solver.
Browse files Browse the repository at this point in the history
Some tests are failing when built with `WITH_UMFPACK=OFF` with an
error like the following in the logs:
```
ERROR:: GetMatrixFormat: UMFPACK solver has not been installed.
```

Skip all tests conditional on `HAVE_UMFPACK` for which the string
"UMFPACK solver has not been installed." was found in the logs.
  • Loading branch information
mmuetzel committed Sep 19, 2024
1 parent c79be1c commit 4db1b7c
Show file tree
Hide file tree
Showing 245 changed files with 1,879 additions and 1,391 deletions.
18 changes: 10 additions & 8 deletions elmerice/Tests/AIFlowSolve/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(AIFlow.sif AIFlow.sif COPYONLY)
CONFIGURE_FILE(AIFlow.sif AIFlow.sif COPYONLY)

SET(FILE_LISTS ${CMAKE_SOURCE_DIR}/elmerice/Solvers/AIFlowSolve_nlS2.F90)
ADD_ELMERICETEST_MODULE(AIFlowSolve AIFlowSolveS2 "${FILE_LISTS}")
SET(FILE_LISTS ${CMAKE_SOURCE_DIR}/elmerice/Solvers/AIFlowSolve_nlS2.F90)
ADD_ELMERICETEST_MODULE(AIFlowSolve AIFlowSolveS2 "${FILE_LISTS}")

TARGET_LINK_LIBRARIES(AIFlowSolve_AIFlowSolveS2 ElmerIceSolvers)
TARGET_LINK_LIBRARIES(AIFlowSolve_AIFlowSolveS2 ElmerIceSolvers)

FILE(COPY ELMERSOLVER_STARTINFO README.txt domec DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO README.txt domec DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(AIFlowSolve)
ADD_ELMERICE_LABEL(AIFlowSolve elmerice-fast)
ADD_ELMERICE_TEST(AIFlowSolve)
ADD_ELMERICE_LABEL(AIFlowSolve elmerice-fast)
ENDIF()
14 changes: 8 additions & 6 deletions elmerice/Tests/BackgroundError/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(case.sif case.sif COPYONLY)
CONFIGURE_FILE(case.sif case.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(BackgroundError)
ADD_ELMERICE_LABEL(BackgroundError elmerice-fast)
ADD_ELMERICE_LABEL(BackgroundError CovUtils)
ADD_ELMERICE_TEST(BackgroundError)
ADD_ELMERICE_LABEL(BackgroundError elmerice-fast)
ADD_ELMERICE_LABEL(BackgroundError CovUtils)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/Buoyancy/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(buoyancy.sif buoyancy.sif COPYONLY)
CONFIGURE_FILE(buoyancy.sif buoyancy.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO README.txt mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO README.txt mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Buoyancy)
ADD_ELMERICE_LABEL(Buoyancy elmerice-fast)
ADD_ELMERICE_TEST(Buoyancy)
ADD_ELMERICE_LABEL(Buoyancy elmerice-fast)
ENDIF()
16 changes: 9 additions & 7 deletions elmerice/Tests/Calving2D/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(calving2d.sif calving2d.sif COPYONLY)
CONFIGURE_FILE(calving2d.sif calving2d.sif COPYONLY)

ADD_ELMERICETEST_MODULE(Calving2D bedrockfunction_flat ./PROG/bedrockfunction_flat.f90)
ADD_ELMERICETEST_MODULE(Calving2D bedrockfunction_flat ./PROG/bedrockfunction_flat.f90)

FILE(COPY ELMERSOLVER_STARTINFO block_helheim.msh PROG DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO block_helheim.msh PROG DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Results/block_helheim")
FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Results/block_helheim")

ADD_ELMERICE_TEST(Calving2D)
ADD_ELMERICE_LABEL(Calving2D slow)
ADD_ELMERICE_TEST(Calving2D)
ADD_ELMERICE_LABEL(Calving2D slow)
ENDIF()
3 changes: 1 addition & 2 deletions elmerice/Tests/Calving3D_lset/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ IF(HAVE_MMG AND HAVE_ZOLTAN)
IF(${NPROCS} GREATER ${MPI_TEST_MAXPROC} OR ${NPROCS} LESS ${MPI_TEST_MINPROC})
MESSAGE(STATUS "Skipping test Calving3D_lset with ${NPROCS} procs")
ELSE()
ADD_ELMERICE_TEST(Calving3D_lset)
ADD_ELMERICE_LABEL(Calving3D_lset slow)
ADD_ELMERICE_TEST(Calving3D_lset LABELS slow)
ENDIF()
ENDIF()

Expand Down
12 changes: 7 additions & 5 deletions elmerice/Tests/ComputeDevStress/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(computeDevStress.sif computeDevStress.sif COPYONLY)
CONFIGURE_FILE(computeDevStress.sif computeDevStress.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(ComputeDevStress)
ADD_ELMERICE_LABEL(ComputeDevStress elmerice-fast)
ADD_ELMERICE_TEST(ComputeDevStress)
ADD_ELMERICE_LABEL(ComputeDevStress elmerice-fast)
ENDIF()
10 changes: 6 additions & 4 deletions elmerice/Tests/Contact/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(cavity.sif cavity.sif COPYONLY)
CONFIGURE_FILE(cavity.sif cavity.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO ice.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO ice.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Contact)
ADD_ELMERICE_TEST(Contact)
ENDIF()
19 changes: 10 additions & 9 deletions elmerice/Tests/CovarianceVector/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(case.sif case.sif COPYONLY)
CONFIGURE_FILE(Init.F90 Init.F90 COPYONLY)

CONFIGURE_FILE(case.sif case.sif COPYONLY)
CONFIGURE_FILE(Init.F90 Init.F90 COPYONLY)
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
ADD_ELMERICETEST_MODULE(CovarianceVector Init ./Init.F90)

ADD_ELMERICETEST_MODULE(CovarianceVector Init ./Init.F90)

ADD_ELMERICE_TEST(CovarianceVector)
ADD_ELMERICE_LABEL(CovarianceVector elmerice-fast)
ADD_ELMERICE_LABEL(CovarianceVector CovUtils)
ADD_ELMERICE_TEST(CovarianceVector)
ADD_ELMERICE_LABEL(CovarianceVector elmerice-fast)
ADD_ELMERICE_LABEL(CovarianceVector CovUtils)
ENDIF()
19 changes: 10 additions & 9 deletions elmerice/Tests/CovarianceVector2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(case.sif case.sif COPYONLY)
CONFIGURE_FILE(Init.F90 Init.F90 COPYONLY)

CONFIGURE_FILE(case.sif case.sif COPYONLY)
CONFIGURE_FILE(Init.F90 Init.F90 COPYONLY)
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
ADD_ELMERICETEST_MODULE(CovarianceVector2 Init ./Init.F90)

ADD_ELMERICETEST_MODULE(CovarianceVector2 Init ./Init.F90)

ADD_ELMERICE_TEST(CovarianceVector2)
ADD_ELMERICE_LABEL(CovarianceVector2 elmerice-fast)
ADD_ELMERICE_LABEL(CovarianceVector2 CovUtils)
ADD_ELMERICE_TEST(CovarianceVector2)
ADD_ELMERICE_LABEL(CovarianceVector2 elmerice-fast)
ADD_ELMERICE_LABEL(CovarianceVector2 CovUtils)
ENDIF()
14 changes: 8 additions & 6 deletions elmerice/Tests/Damage/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(damage.sif damage.sif COPYONLY)
CONFIGURE_FILE(damage.sif damage.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Damage)
ADD_ELMERICE_LABEL(Damage elmerice-long)
ADD_ELMERICE_LABEL(Damage slow)
ADD_ELMERICE_TEST(Damage)
ADD_ELMERICE_LABEL(Damage elmerice-long)
ADD_ELMERICE_LABEL(Damage slow)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/EigenValues/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(carre2D.sif carre2D.sif COPYONLY)
CONFIGURE_FILE(carre2D.sif carre2D.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(EigenValues)
ADD_ELMERICE_LABEL(EigenValues elmerice-fast)
ADD_ELMERICE_TEST(EigenValues)
ADD_ELMERICE_LABEL(EigenValues elmerice-fast)
ENDIF()
14 changes: 8 additions & 6 deletions elmerice/Tests/Emergence/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(emergencevelocity_restart.sif emergencevelocity_restart.sif COPYONLY)
CONFIGURE_FILE(emergencevelocity_restart.sif emergencevelocity_restart.sif COPYONLY)

ADD_ELMERICETEST_MODULE(Emergence buelerprofile buelerprofile.f90)
FILE(COPY ELMERSOLVER_STARTINFO buelerprofile.f90 footprint_bueler_f DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
ADD_ELMERICETEST_MODULE(Emergence buelerprofile buelerprofile.f90)
FILE(COPY ELMERSOLVER_STARTINFO buelerprofile.f90 footprint_bueler_f DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Emergence)
ADD_ELMERICE_LABEL(Emergence elmerice-fast)
ADD_ELMERICE_TEST(Emergence)
ADD_ELMERICE_LABEL(Emergence elmerice-fast)
ENDIF()
14 changes: 8 additions & 6 deletions elmerice/Tests/Enthalpy/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(enthalpy.sif enthalpy.sif COPYONLY)
CONFIGURE_FILE(enthalpy.sif enthalpy.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO WithOutCavity DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO WithOutCavity DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Enthalpy)
ADD_ELMERICE_LABEL(Enthalpy elmerice-long)
ADD_ELMERICE_LABEL(Enthalpy slow)
ADD_ELMERICE_TEST(Enthalpy)
ADD_ELMERICE_LABEL(Enthalpy elmerice-long)
ADD_ELMERICE_LABEL(Enthalpy slow)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/ExportVertically/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(exportvertically.sif exportvertically.sif COPYONLY)
CONFIGURE_FILE(exportvertically.sif exportvertically.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(ExportVertically)
ADD_ELMERICE_LABEL(ExportVertically elmerice-fast)
ADD_ELMERICE_TEST(ExportVertically)
ADD_ELMERICE_LABEL(ExportVertically elmerice-fast)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/ForceToStress/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(test.sif test.sif COPYONLY)
CONFIGURE_FILE(test.sif test.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(ForceToStress)
ADD_ELMERICE_LABEL(ForceToStress elmerice-fast)
ADD_ELMERICE_TEST(ForceToStress)
ADD_ELMERICE_LABEL(ForceToStress elmerice-fast)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/ForceToStress_periodic/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(test.sif test.sif COPYONLY)
CONFIGURE_FILE(test.sif test.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(ForceToStress_periodic)
ADD_ELMERICE_LABEL(ForceToStress_periodic elmerice-fast)
ADD_ELMERICE_TEST(ForceToStress_periodic)
ADD_ELMERICE_LABEL(ForceToStress_periodic elmerice-fast)
ENDIF()
13 changes: 7 additions & 6 deletions elmerice/Tests/FrictionHeat/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(test.sif test.sif COPYONLY)
CONFIGURE_FILE(test.sif test.sif COPYONLY)

ADD_ELMERICETEST_MODULE(FrictionHeat DummySolver DummySolver.f90)
FILE(COPY ELMERSOLVER_STARTINFO DummySolver.f90 cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(FrictionHeat)
ADD_ELMERICETEST_MODULE(FrictionHeat DummySolver DummySolver.f90)
FILE(COPY ELMERSOLVER_STARTINFO DummySolver.f90 cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(FrictionHeat)
ENDIF()
13 changes: 7 additions & 6 deletions elmerice/Tests/FrictionHeatMasked/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(test.sif test.sif COPYONLY)
CONFIGURE_FILE(test.sif test.sif COPYONLY)

ADD_ELMERICETEST_MODULE(FrictionHeatMasked DummySolver DummySolver.f90)
FILE(COPY ELMERSOLVER_STARTINFO DummySolver.f90 cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(FrictionHeatMasked)
ADD_ELMERICETEST_MODULE(FrictionHeatMasked DummySolver DummySolver.f90)
FILE(COPY ELMERSOLVER_STARTINFO DummySolver.f90 cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(FrictionHeatMasked)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/Friction_Coulomb/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(ismip_coulomb.sif ismip_coulomb.sif COPYONLY)
CONFIGURE_FILE(ismip_coulomb.sif ismip_coulomb.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Friction_Coulomb)
ADD_ELMERICE_LABEL(Friction_Coulomb elmerice-fast)
ADD_ELMERICE_TEST(Friction_Coulomb)
ADD_ELMERICE_LABEL(Friction_Coulomb elmerice-fast)
ENDIF()
10 changes: 6 additions & 4 deletions elmerice/Tests/Friction_Coulomb_Pw/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(ismip_coulomb_pw.sif ismip_coulomb_pw.sif COPYONLY)
CONFIGURE_FILE(ismip_coulomb_pw.sif ismip_coulomb_pw.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Friction_Coulomb_Pw)
ADD_ELMERICE_TEST(Friction_Coulomb_Pw)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/Friction_Weertman/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(ismip_weertman.sif ismip_weertman.sif COPYONLY)
CONFIGURE_FILE(ismip_weertman.sif ismip_weertman.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Friction_Weertman)
ADD_ELMERICE_LABEL(Friction_Weertman elmerice-fast)
ADD_ELMERICE_TEST(Friction_Weertman)
ADD_ELMERICE_LABEL(Friction_Weertman elmerice-fast)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/Friction_Weertman2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(ismip_weertman2.sif ismip_weertman2.sif COPYONLY)
CONFIGURE_FILE(ismip_weertman2.sif ismip_weertman2.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Friction_Weertman2)
ADD_ELMERICE_LABEL(Friction_Weertman2 elmerice-fast)
ADD_ELMERICE_TEST(Friction_Weertman2)
ADD_ELMERICE_LABEL(Friction_Weertman2 elmerice-fast)
ENDIF()
12 changes: 7 additions & 5 deletions elmerice/Tests/Friction_WeertmanNewton/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
IF(HAVE_UMFPACK)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)

CONFIGURE_FILE(case.sif case.sif COPYONLY)
CONFIGURE_FILE(case.sif case.sif COPYONLY)

FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")

ADD_ELMERICE_TEST(Friction_WeertmanNewton)
ADD_ELMERICE_LABEL(Friction_WeertmanNewton elmerice-fast)
ADD_ELMERICE_TEST(Friction_WeertmanNewton)
ADD_ELMERICE_LABEL(Friction_WeertmanNewton elmerice-fast)
ENDIF()
Loading

0 comments on commit 4db1b7c

Please sign in to comment.