From c2420531b5110e0b0ffe0e72c7950b9eb0630b3b Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Wed, 10 Sep 2014 16:47:01 +0200 Subject: [PATCH] Update for moved files into the ProcessLib. --- OGS/ProjectData.h | 4 ++-- ProcessLib/BoundaryCondition.h | 10 +++++----- ProcessLib/GroundwaterFlow.h | 8 ++++---- ProcessLib/InitialCondition.h | 10 +++++----- ProcessLib/ProcessVariable.h | 22 +++++++++++----------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/OGS/ProjectData.h b/OGS/ProjectData.h index 397e30a3b0e..fffb8487132 100644 --- a/OGS/ProjectData.h +++ b/OGS/ProjectData.h @@ -21,7 +21,7 @@ #include "GeoLib/GEOObjects.h" #endif -#include "OGS/ProcessVariable.h" +#include "ProcessLib/ProcessVariable.h" namespace MeshLib { class Mesh; } @@ -93,7 +93,7 @@ private: #endif std::vector<MeshLib::Mesh*> _mesh_vec; std::vector<ProcessLib::Process*> _processes; - std::vector<OGS::ProcessVariable> _process_variables; + std::vector<ProcessLib::ProcessVariable> _process_variables; }; #endif //PROJECTDATA_H_ diff --git a/ProcessLib/BoundaryCondition.h b/ProcessLib/BoundaryCondition.h index 822d9353d36..f0bffa0c1f8 100644 --- a/ProcessLib/BoundaryCondition.h +++ b/ProcessLib/BoundaryCondition.h @@ -7,8 +7,8 @@ * */ -#ifndef OGS_BOUNDARY_CONDITION_H_ -#define OGS_BOUNDARY_CONDITION_H_ +#ifndef PROCESS_LIB_BOUNDARY_CONDITION_H_ +#define PROCESS_LIB_BOUNDARY_CONDITION_H_ #include <boost/property_tree/ptree.hpp> #include "logog/include/logog.hpp" @@ -18,7 +18,7 @@ namespace GeoLib class GeoObject; } -namespace OGS +namespace ProcessLib { class BoundaryCondition @@ -54,6 +54,6 @@ private: }; -} // namespace OGS +} // namespace ProcessLib -#endif // OGS_BOUNDARY_CONDITION_H_ +#endif // PROCESS_LIB_BOUNDARY_CONDITION_H_ diff --git a/ProcessLib/GroundwaterFlow.h b/ProcessLib/GroundwaterFlow.h index c1dd04ad221..ebd7b50e981 100644 --- a/ProcessLib/GroundwaterFlow.h +++ b/ProcessLib/GroundwaterFlow.h @@ -14,7 +14,7 @@ #include "logog/include/logog.hpp" #include "MeshLib/Mesh.h" -#include "OGS/ProcessVariable.h" +#include "ProcessVariable.h" namespace ProcessLib { @@ -25,7 +25,7 @@ class GroundwaterFlowProcess : public Process public: GroundwaterFlowProcess(MeshLib::Mesh const& mesh, - std::vector<OGS::ProcessVariable> const& variables, + std::vector<ProcessVariable> const& variables, ConfigTree const& config) : Process(mesh, 1) { @@ -35,7 +35,7 @@ public: std::string const name = config.get<std::string>("process_variable"); auto const& variable = std::find_if(variables.cbegin(), variables.cend(), - [&name](OGS::ProcessVariable const& v) { + [&name](ProcessVariable const& v) { return v.getName() == name; }); @@ -58,7 +58,7 @@ public: } private: - OGS::ProcessVariable const* _hydraulic_head = nullptr; + ProcessVariable const* _hydraulic_head = nullptr; }; } // namespace ProcessLib diff --git a/ProcessLib/InitialCondition.h b/ProcessLib/InitialCondition.h index 7ac4069c4db..ca911631a11 100644 --- a/ProcessLib/InitialCondition.h +++ b/ProcessLib/InitialCondition.h @@ -7,15 +7,15 @@ * */ -#ifndef OGS_INITIAL_CONDITION_H_ -#define OGS_INITIAL_CONDITION_H_ +#ifndef PROCESS_LIB_INITIAL_CONDITION_H_ +#define PROCESS_LIB_INITIAL_CONDITION_H_ #include <boost/property_tree/ptree.hpp> #include "logog/include/logog.hpp" #include "MeshLib/Mesh.h" -namespace OGS +namespace ProcessLib { class InitialCondition @@ -42,6 +42,6 @@ private: }; -} // namespace OGS +} // namespace ProcessLib -#endif // OGS_INITIAL_CONDITION_H_ +#endif // PROCESS_LIB_INITIAL_CONDITION_H_ diff --git a/ProcessLib/ProcessVariable.h b/ProcessLib/ProcessVariable.h index 8473a8ea9fc..81a6036b37d 100644 --- a/ProcessLib/ProcessVariable.h +++ b/ProcessLib/ProcessVariable.h @@ -7,8 +7,8 @@ * */ -#ifndef OGS_PROCESS_VARIABLE_H_ -#define OGS_PROCESS_VARIABLE_H_ +#ifndef PROCESS_LIB_PROCESS_VARIABLE_H_ +#define PROCESS_LIB_PROCESS_VARIABLE_H_ #include <boost/property_tree/ptree.hpp> #include "logog/include/logog.hpp" @@ -16,10 +16,10 @@ #include "GeoLib/GEOObjects.h" #include "MeshLib/Mesh.h" -#include "OGS/BoundaryCondition.h" -#include "OGS/InitialCondition.h" +#include "BoundaryCondition.h" +#include "InitialCondition.h" -namespace OGS +namespace ProcessLib { /// A named process variable. Its properties includes the mesh, and the initial @@ -46,7 +46,7 @@ public: if (type == "Uniform") { _initial_condition = - new OGS::UniformInitialCondition(ic_config->second); + new UniformInitialCondition(ic_config->second); } else { @@ -82,7 +82,7 @@ public: if (type == "Dirichlet") { _boundary_conditions.emplace_back( - new OGS::DirichletBoundaryCondition( + new DirichletBoundaryCondition( geometry, bc_config)); } else @@ -111,10 +111,10 @@ public: private: std::string const _name; MeshLib::Mesh const& _mesh; - OGS::InitialCondition* _initial_condition; - std::vector<OGS::BoundaryCondition*> _boundary_conditions; + InitialCondition* _initial_condition; + std::vector<BoundaryCondition*> _boundary_conditions; }; -} // namespace OGS +} // namespace ProcessLib -#endif // OGS_PROCESS_VARIABLE_H_ +#endif // PROCESS_LIB_PROCESS_VARIABLE_H_ -- GitLab