-
Notifications
You must be signed in to change notification settings - Fork 238
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'THM_M_Freezing' into 'master'
Extend THM to TM-freezing See merge request ogs/ogs!4642
- Loading branch information
Showing
35 changed files
with
1,529 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,5 +51,6 @@ subproblems | |
thermohydromechanics | ||
thermomechanical | ||
thermomechanics | ||
undeformed | ||
voxel | ||
wellbore |
1 change: 1 addition & 0 deletions
1
Documentation/ProjectFile/material/solid/t_ice_constitutive_relation.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
The constitutive relation for ice used in some processes. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/** | ||
* \file | ||
* \copyright | ||
* Copyright (c) 2012-2023, OpenGeoSys Community (http://www.opengeosys.org) | ||
* Distributed under a Modified BSD License. | ||
* See accompanying file LICENSE.txt or | ||
* http://www.opengeosys.org/project/license | ||
*/ | ||
|
||
#include "CreateConstitutiveRelationIce.h" | ||
|
||
#include "BaseLib/ConfigTree.h" | ||
#include "MaterialLib/SolidModels/CreateConstitutiveRelation.h" | ||
#include "MechanicsBase.h" | ||
|
||
namespace MaterialLib | ||
{ | ||
namespace Solids | ||
{ | ||
template <int DisplacementDim> | ||
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>> | ||
createConstitutiveRelationIce( | ||
std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, | ||
std::optional<ParameterLib::CoordinateSystem> const& | ||
local_coordinate_system, | ||
BaseLib::ConfigTree const& config) | ||
{ | ||
auto const ice_constitutive_relation_config = | ||
//! \ogs_file_param{material__solid__ice_constitutive_relation} | ||
config.getConfigSubtreeOptional("ice_constitutive_relation"); | ||
|
||
if (!ice_constitutive_relation_config) | ||
{ | ||
return nullptr; | ||
} | ||
|
||
return MaterialLib::Solids::createConstitutiveRelation<DisplacementDim>( | ||
parameters, local_coordinate_system, *ice_constitutive_relation_config); | ||
} | ||
|
||
template std::unique_ptr<MaterialLib::Solids::MechanicsBase<2>> | ||
createConstitutiveRelationIce( | ||
std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, | ||
std::optional<ParameterLib::CoordinateSystem> const& | ||
local_coordinate_system, | ||
BaseLib::ConfigTree const& config); | ||
|
||
template std::unique_ptr<MaterialLib::Solids::MechanicsBase<3>> | ||
createConstitutiveRelationIce( | ||
std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, | ||
std::optional<ParameterLib::CoordinateSystem> const& | ||
local_coordinate_system, | ||
BaseLib::ConfigTree const& config); | ||
} // namespace Solids | ||
} // namespace MaterialLib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/** | ||
* \file | ||
* \copyright | ||
* Copyright (c) 2012-2023, OpenGeoSys Community (http://www.opengeosys.org) | ||
* Distributed under a Modified BSD License. | ||
* See accompanying file LICENSE.txt or | ||
* http://www.opengeosys.org/project/license | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include <memory> | ||
#include <optional> | ||
#include <vector> | ||
|
||
namespace BaseLib | ||
{ | ||
class ConfigTree; | ||
} | ||
|
||
namespace ParameterLib | ||
{ | ||
struct ParameterBase; | ||
struct CoordinateSystem; | ||
} // namespace ParameterLib | ||
|
||
namespace MaterialLib | ||
{ | ||
namespace Solids | ||
{ | ||
template <int DisplacementDim> | ||
struct MechanicsBase; | ||
|
||
template <int DisplacementDim> | ||
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>> | ||
createConstitutiveRelationIce( | ||
std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, | ||
std::optional<ParameterLib::CoordinateSystem> const& | ||
local_coordinate_system, | ||
BaseLib::ConfigTree const& config); | ||
|
||
extern template std::unique_ptr<MaterialLib::Solids::MechanicsBase<2>> | ||
createConstitutiveRelationIce( | ||
std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, | ||
std::optional<ParameterLib::CoordinateSystem> const& | ||
local_coordinate_system, | ||
BaseLib::ConfigTree const& config); | ||
|
||
extern template std::unique_ptr<MaterialLib::Solids::MechanicsBase<3>> | ||
createConstitutiveRelationIce( | ||
std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, | ||
std::optional<ParameterLib::CoordinateSystem> const& | ||
local_coordinate_system, | ||
BaseLib::ConfigTree const& config); | ||
} // namespace Solids | ||
} // namespace MaterialLib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.