Skip to content
Snippets Groups Projects
Commit 1d84dcd1 authored by Tom Fischer's avatar Tom Fischer
Browse files

Merge branch 'DeprecateUnmaintainedProcesses' into 'master'

Deprecate unmaintained processes

See merge request ogs/ogs!5093
parents 350ab93a 29916ea6
No related branches found
No related tags found
No related merge requests found
...@@ -731,6 +731,9 @@ void ProjectData::parseProcesses( ...@@ -731,6 +731,9 @@ void ProjectData::parseProcesses(
#ifdef OGS_BUILD_PROCESS_STOKESFLOW #ifdef OGS_BUILD_PROCESS_STOKESFLOW
if (type == "StokesFlow") if (type == "StokesFlow")
{ {
WARN(
"The StokesFlow process is deprecated and will be removed in "
"OGS-6.5.5.");
switch (_mesh_vec[0]->getDimension()) switch (_mesh_vec[0]->getDimension())
{ {
case 2: case 2:
...@@ -752,6 +755,9 @@ void ProjectData::parseProcesses( ...@@ -752,6 +755,9 @@ void ProjectData::parseProcesses(
#ifdef OGS_BUILD_PROCESS_TES #ifdef OGS_BUILD_PROCESS_TES
if (type == "TES") if (type == "TES")
{ {
WARN(
"The TES process is deprecated and will be removed in "
"OGS-6.5.5.");
process = ProcessLib::TES::createTESProcess( process = ProcessLib::TES::createTESProcess(
name, *_mesh_vec[0], std::move(jacobian_assembler), name, *_mesh_vec[0], std::move(jacobian_assembler),
_process_variables, _parameters, integration_order, _process_variables, _parameters, integration_order,
...@@ -1033,6 +1039,9 @@ void ProjectData::parseProcesses( ...@@ -1033,6 +1039,9 @@ void ProjectData::parseProcesses(
#ifdef OGS_BUILD_PROCESS_SMALLDEFORMATIONNONLOCAL #ifdef OGS_BUILD_PROCESS_SMALLDEFORMATIONNONLOCAL
if (type == "SMALL_DEFORMATION_NONLOCAL") if (type == "SMALL_DEFORMATION_NONLOCAL")
{ {
WARN(
"The SMALL_DEFORMATION_NONLOCAL process is deprecated and will "
"be removed in OGS-6.5.5.");
switch (_mesh_vec[0]->getDimension()) switch (_mesh_vec[0]->getDimension())
{ {
case 2: case 2:
...@@ -1145,6 +1154,9 @@ void ProjectData::parseProcesses( ...@@ -1145,6 +1154,9 @@ void ProjectData::parseProcesses(
#ifdef OGS_BUILD_PROCESS_THERMOMECHANICALPHASEFIELD #ifdef OGS_BUILD_PROCESS_THERMOMECHANICALPHASEFIELD
if (type == "THERMO_MECHANICAL_PHASE_FIELD") if (type == "THERMO_MECHANICAL_PHASE_FIELD")
{ {
WARN(
"The THERMO_MECHANICAL_PHASE_FIELD process is deprecated and "
"will be removed in OGS-6.5.5.");
switch (_mesh_vec[0]->getDimension()) switch (_mesh_vec[0]->getDimension())
{ {
case 2: case 2:
...@@ -1290,6 +1302,9 @@ void ProjectData::parseProcesses( ...@@ -1290,6 +1302,9 @@ void ProjectData::parseProcesses(
#ifdef OGS_BUILD_PROCESS_TWOPHASEFLOWWITHPRHO #ifdef OGS_BUILD_PROCESS_TWOPHASEFLOWWITHPRHO
if (type == "TWOPHASE_FLOW_PRHO") if (type == "TWOPHASE_FLOW_PRHO")
{ {
WARN(
"The TWOPHASE_FLOW_PRHO process is deprecated and will be "
"removed in OGS-6.5.5.");
process = ProcessLib::TwoPhaseFlowWithPrho:: process = ProcessLib::TwoPhaseFlowWithPrho::
createTwoPhaseFlowWithPrhoProcess( createTwoPhaseFlowWithPrhoProcess(
name, *_mesh_vec[0], std::move(jacobian_assembler), name, *_mesh_vec[0], std::move(jacobian_assembler),
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
- if [[ "$OSTYPE" == "darwin"* ]] ; then readlink_cmd=greadlink; else readlink_cmd=readlink; fi - if [[ "$OSTYPE" == "darwin"* ]] ; then readlink_cmd=greadlink; else readlink_cmd=readlink; fi
- ln -s `$readlink_cmd -f $build_dir_full` build/${CMAKE_PRESET}-${CI_JOB_NAME_SLUG}-${CI_JOB_ID} - ln -s `$readlink_cmd -f $build_dir_full` build/${CMAKE_PRESET}-${CI_JOB_NAME_SLUG}-${CI_JOB_ID}
- ([[ $BUILD_CTEST_LARGE_ON_MASTER && "${CI_COMMIT_BRANCH}" == "master" ]]) && export BUILD_CTEST_LARGE=true - ([[ $BUILD_CTEST_LARGE_ON_MASTER && "${CI_COMMIT_BRANCH}" == "master" ]]) && export BUILD_CTEST_LARGE=true
- cmake --preset=$CMAKE_PRESET --log-level=VERBOSE -Wno-dev $CMAKE_ARGS - cmake --preset=$CMAKE_PRESET --log-level=VERBOSE -Wno-dev $CMAKE_ARGS -DOGS_BUILD_DEPRECATED_PROCESSES=ON
# Activate .venv via .envrc # Activate .venv via .envrc
- test -f $build_dir_full/.venv/bin/activate && source $build_dir_full/.envrc - test -f $build_dir_full/.venv/bin/activate && source $build_dir_full/.envrc
- | - |
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
- mkdir build # We are inside the OGS source directory, now. This "build" dir will be, too. - mkdir build # We are inside the OGS source directory, now. This "build" dir will be, too.
# Create symlink https://stackoverflow.com/a/34905638/80480 # Create symlink https://stackoverflow.com/a/34905638/80480
- cmd /c mklink /D $artifacts_dir $env:CI_PROJECT_DIR\$build_directory_full - cmd /c mklink /D $artifacts_dir $env:CI_PROJECT_DIR\$build_directory_full
- $cmake_cmd = "cmake --preset=$env:CMAKE_PRESET --log-level=VERBOSE -Wno-dev $env:CMAKE_ARGS" - $cmake_cmd = "cmake --preset=$env:CMAKE_PRESET --log-level=VERBOSE -Wno-dev $env:CMAKE_ARGS -DOGS_BUILD_DEPRECATED_PROCESSES=ON"
- $cmake_cmd - $cmake_cmd
- Invoke-Expression $cmake_cmd - Invoke-Expression $cmake_cmd
# Activate .venv # Activate .venv
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# processes to be build. # processes to be build.
set(_processes_list set(_processes_list
ComponentTransport ComponentTransport
StokesFlow
HT HT
HeatConduction HeatConduction
HeatTransportBHE HeatTransportBHE
...@@ -14,19 +13,25 @@ set(_processes_list ...@@ -14,19 +13,25 @@ set(_processes_list
RichardsFlow RichardsFlow
RichardsMechanics RichardsMechanics
SmallDeformation SmallDeformation
SmallDeformationNonlocal
SteadyStateDiffusion SteadyStateDiffusion
TES
TH2M TH2M
ThermalTwoPhaseFlowWithPP ThermalTwoPhaseFlowWithPP
ThermoHydroMechanics ThermoHydroMechanics
ThermoMechanicalPhaseField
ThermoMechanics ThermoMechanics
ThermoRichardsFlow ThermoRichardsFlow
TwoPhaseFlowWithPP TwoPhaseFlowWithPP
TwoPhaseFlowWithPrho
WellboreSimulator WellboreSimulator
) )
option(OGS_BUILD_DEPRECATED_PROCESSES "Build deprecated processes" OFF)
if(OGS_BUILD_DEPRECATED_PROCESSES)
set(_deprecated_processes TwoPhaseFlowWithPrho SmallDeformationNonlocal
TES ThermoMechanicalPhaseField StokesFlow)
list(APPEND _processes_list ${_deprecated_processes})
foreach(process ${_deprecated_processes})
message(WARNING "${process} is deprecated and will be removed in OGS-6.5.5.")
endforeach()
endif()
if(OGS_USE_MFRONT) if(OGS_USE_MFRONT)
set(_processes_list ${_processes_list} LargeDeformation) set(_processes_list ${_processes_list} LargeDeformation)
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment