diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h index 69bb1a685a9c569cacc5c0c5a7efccd326f8af09..a03e466ed81bb58559448ecfbaf2cb51124ff5b3 100644 --- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h +++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h @@ -47,9 +47,6 @@ public: bool isLinear() const override { return true; } //! @} - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::GroundwaterFlowProcess;} - std::vector<double> getFlux(std::size_t element_id, MathLib::Point3d const& p, GlobalVector const& x) const override diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h index 1da30247709dc883431382913ed455fbbb1a952a..aa48954ed22668aec6f1d9ce1f3e322efde2388e 100644 --- a/ProcessLib/HT/HTProcess.h +++ b/ProcessLib/HT/HTProcess.h @@ -57,9 +57,6 @@ public: bool isLinear() const override { return false; } //! @} - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::HTProcess;} - private: void initializeConcreteProcess( NumLib::LocalToGlobalIndexMap const& dof_table, diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.h b/ProcessLib/HeatConduction/HeatConductionProcess.h index 5c94f4f95b60c12a5884015b5ec8b99e37c1bb17..ae9a4a119a0306cfc885f9979bd3a2a85e649cdf 100644 --- a/ProcessLib/HeatConduction/HeatConductionProcess.h +++ b/ProcessLib/HeatConduction/HeatConductionProcess.h @@ -36,9 +36,6 @@ public: //! \name ODESystem interface //! @{ - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::HeatConductionProcess;} - bool isLinear() const override { return true; } void computeSecondaryVariableConcrete(double const t, diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h index 88d59391b9a2d9efc3917113f091aedf78fddc85..8b6e072941d893179311e1d024d0f4cdea470e4b 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h +++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h @@ -57,9 +57,6 @@ public: bool isLinear() const override { return false; } //! @} - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::HydroMechanicsProcess;} - private: void constructDofTable() override { diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h index 8638c0fbf6e5c3ccbc1ad401390bef854743fc09..ffcac549958c0bbf95a7570208421410f64dbb68 100644 --- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h +++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h @@ -52,9 +52,6 @@ public: bool isLinear() const override { return false; } //! @} - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::HydroMechanicsProcess;} - void computeSecondaryVariableConcrete(double const t, GlobalVector const& x) override; diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h index 52fe3451935661e1602da6417be2c308f264c6bd..fec8e1840d01805b3b4d42e4b251426c5c10eee6 100644 --- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h +++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h @@ -53,9 +53,6 @@ public: bool isLinear() const override { return false; } //! @} - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::SmallDeformationProcess;} - private: using LocalAssemblerInterface = SmallDeformationLocalAssemblerInterface; diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.h b/ProcessLib/LiquidFlow/LiquidFlowProcess.h index d7431f6258922f6b1b1e7b1da96e5c1386ef23df..737e6b11501e623cd2ff135e4a976bdf6c208bc4 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowProcess.h +++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.h @@ -77,9 +77,6 @@ public: bool isLinear() const override { return true; } - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::LiquidFlowProcess;} - private: void initializeConcreteProcess( NumLib::LocalToGlobalIndexMap const& dof_table, diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h index 73ab1bc0395e948e0b63141110b228e39bbbc727..3290e47c65a7654f96fa644aa9fd53f8ab693f25 100644 --- a/ProcessLib/Process.h +++ b/ProcessLib/Process.h @@ -21,7 +21,6 @@ #include "SecondaryVariable.h" #include "CachedSecondaryVariable.h" #include "AbstractJacobianAssembler.h" -#include "ProcessType.h" #include "StaggeredCouplingTerm.h" #include "VectorMatrixAssembler.h" @@ -50,8 +49,6 @@ public: SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller); - virtual ProcessType getProcessType() const = 0; - /// Preprocessing before starting assembly for new timestep. void preTimestep(GlobalVector const& x, const double t, const double delta_t); diff --git a/ProcessLib/ProcessType.h b/ProcessLib/ProcessType.h deleted file mode 100644 index 2befa719d6caaff1971905a2cece323a3513a732..0000000000000000000000000000000000000000 --- a/ProcessLib/ProcessType.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * \copyright - * Copyright (c) 2012-2017, OpenGeoSys Community (http://www.opengeosys.org) - * Distributed under a Modified BSD License. - * See accompanying file LICENSE.txt or - * http://www.opengeosys.org/project/license - * - * \file ProcessType.h - * - * Created on December 14, 2016, 3:13 PM - */ - - -#pragma once - -namespace ProcessLib -{ -enum ProcessType -{ - GroundwaterFlowProcess, - LiquidFlowProcess, - RichardsFlowProcess, - TwoPhaseFlowWithPPProcess, - HeatConductionProcess, - HTProcess, - HydroMechanicsProcess, - SmallDeformationProcess, - TESProcess -}; -} diff --git a/ProcessLib/RichardsFlow/RichardsFlowProcess.h b/ProcessLib/RichardsFlow/RichardsFlowProcess.h index bcab9778a861dcd23b59d94c52d423e4a5551079..e24395010aa2c0fff8e8f5fae4f8a5ead0002261 100644 --- a/ProcessLib/RichardsFlow/RichardsFlowProcess.h +++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.h @@ -41,9 +41,6 @@ public: bool isLinear() const override { return false; } //! @} - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::RichardsFlowProcess;} - private: void initializeConcreteProcess( NumLib::LocalToGlobalIndexMap const& dof_table, diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/SmallDeformation/SmallDeformationProcess.h index c94a7b001a4e90d902e0f18803771be087974f12..afb5003f63382b63b3ba13c2d57b4877b2ea7d62 100644 --- a/ProcessLib/SmallDeformation/SmallDeformationProcess.h +++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.h @@ -52,9 +52,6 @@ public: bool isLinear() const override { return false; } //! @} - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::SmallDeformationProcess;} - private: using LocalAssemblerInterface = SmallDeformationLocalAssemblerInterface; diff --git a/ProcessLib/TES/TESProcess.h b/ProcessLib/TES/TESProcess.h index 5a340fbb6c72f7c8bd2ba62e55a496bc78766138..ab340d9b776a8aca030894047edb436f84b38a08 100644 --- a/ProcessLib/TES/TESProcess.h +++ b/ProcessLib/TES/TESProcess.h @@ -49,9 +49,6 @@ public: bool isLinear() const override { return false; } - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::TESProcess;} - private: void initializeConcreteProcess( NumLib::LocalToGlobalIndexMap const& dof_table, diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h index 155deaef90169914a3d07e6b2383915297d58d5c..dd0f8789033d63d48de31041bcc60b20c8996812 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h @@ -53,9 +53,6 @@ public: bool isLinear() const override { return false; } - ProcessType getProcessType() const override - {return ProcessLib::ProcessType::TwoPhaseFlowWithPPProcess;} - private: void initializeConcreteProcess( NumLib::LocalToGlobalIndexMap const& dof_table,