diff --git a/ProcessLib/PhaseField/Tests.cmake b/ProcessLib/PhaseField/Tests.cmake index dbe103f1b4c65cac74ae1ab984b61bfe2c4fec76..e0db23c80e89549491587600e0141eebb72ffe89 100644 --- a/ProcessLib/PhaseField/Tests.cmake +++ b/ProcessLib/PhaseField/Tests.cmake @@ -136,8 +136,8 @@ AddTest( ) if(OGS_USE_PETSC) - NotebookTest(NOTEBOOKFILE PhaseField/surfing_jupyter_notebook/surfing_pyvista.ipynb RUNTIME 25 RESOURCE_LOCK PYVISTA) - NotebookTest(NOTEBOOKFILE PhaseField/beam_jupyter_notebook/beam.ipynb RUNTIME 500 RESOURCE_LOCK PYVISTA) + NotebookTest(NOTEBOOKFILE PhaseField/surfing_jupyter_notebook/surfing_pyvista.ipynb RUNTIME 25) + NotebookTest(NOTEBOOKFILE PhaseField/beam_jupyter_notebook/beam.ipynb RUNTIME 500) endif() if(TEST nb-PhaseField/beam_jupyter_notebook/beam-LARGE) diff --git a/ProcessLib/SmallDeformation/Tests.cmake b/ProcessLib/SmallDeformation/Tests.cmake index 18e9b0488c35f1d0ef15834b88778933fed4b619..b42e7e9e8add59a72e289635063899f934afb8a7 100644 --- a/ProcessLib/SmallDeformation/Tests.cmake +++ b/ProcessLib/SmallDeformation/Tests.cmake @@ -270,8 +270,8 @@ AddTest( if(NOT OGS_USE_PETSC) NotebookTest(NOTEBOOKFILE Mechanics/Linear/SimpleMechanics.ipynb RUNTIME 5) - NotebookTest(NOTEBOOKFILE Mechanics/Linear/DiscWithHole/Linear_Disc_with_hole.ipynb RUNTIME 15 RESOURCE_LOCK PYVISTA) + NotebookTest(NOTEBOOKFILE Mechanics/Linear/DiscWithHole/Linear_Disc_with_hole.ipynb RUNTIME 15) if(NOT WIN32) - NotebookTest(NOTEBOOKFILE Mechanics/Linear/DiscWithHole/Linear_Disc_with_hole_convergence_analysis.ipynb RUNTIME 40 RESOURCE_LOCK PYVISTA) + NotebookTest(NOTEBOOKFILE Mechanics/Linear/DiscWithHole/Linear_Disc_with_hole_convergence_analysis.ipynb RUNTIME 40) endif() endif() diff --git a/ProcessLib/TH2M/Tests.cmake b/ProcessLib/TH2M/Tests.cmake index 71bd796b0d63f471ae1c6083420628630d0729c7..316214f76635368efb0dde26ca8c554a2835a279 100644 --- a/ProcessLib/TH2M/Tests.cmake +++ b/ProcessLib/TH2M/Tests.cmake @@ -9,7 +9,7 @@ if (NOT OGS_USE_MPI) OgsTest(PROJECTFILE TH2M/THM/Confined_Compression/THM_confined_compression_liquid.prj RUNTIME 55) OgsTest(PROJECTFILE TH2M/TH/idealGasLaw/compression_gas.prj RUNTIME 1) OgsTest(PROJECTFILE TH2M/H2M/Liakopoulos/liakopoulos_TH2M.prj RUNTIME 15) - NotebookTest(NOTEBOOKFILE TH2M/H2M/Liakopoulos/ogs-jupyter-lab-h2m-2d-liakopoulos.ipynb RUNTIME 15 RESOURCE_LOCK PYVISTA) + NotebookTest(NOTEBOOKFILE TH2M/H2M/Liakopoulos/ogs-jupyter-lab-h2m-2d-liakopoulos.ipynb RUNTIME 15) OgsTest(PROJECTFILE TH2M/H2M/Liakopoulos/liakopoulos_newton.xml RUNTIME 5) OgsTest(PROJECTFILE TH2M/H2M/OrthotropicSwelling/square.prj RUNTIME 1) OgsTest(PROJECTFILE TH2M/H2/mcWhorter/mcWhorter_h2.prj RUNTIME 55) diff --git a/ProcessLib/Tests.cmake b/ProcessLib/Tests.cmake index e1d04e32fe9b7fcdb331c507b87704ed0364b924..8124203e3e1444a8ca2c0aa37e102423d1f9b090 100644 --- a/ProcessLib/Tests.cmake +++ b/ProcessLib/Tests.cmake @@ -7,15 +7,7 @@ if(TARGET ThermoHydroMechanics NotebookTest( NOTEBOOKFILE ThermoHydroMechanics/Linear/Point_injection/SaturatedPointheatsource.ipynb - RUNTIME - 1800 + RUNTIME 1800 + PROPERTIES PROCESSORS 4 ) - if(TEST - nb-ThermoHydroMechanics/Linear/Point_injection/SaturatedPointheatsource-LARGE - ) - set_tests_properties( - nb-ThermoHydroMechanics/Linear/Point_injection/SaturatedPointheatsource-LARGE - PROPERTIES PROCESSORS 4 - ) - endif() endif()