Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mojtaba Abdolkhani
ogs
Commits
27a15c88
Commit
27a15c88
authored
6 years ago
by
Tom Fischer
Committed by
Dmitri Naumov
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[PL/HT] Remove PorousMediaProperties from HT.
parent
25de3305
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ProcessLib/HT/CreateHTProcess.cpp
+0
-7
0 additions, 7 deletions
ProcessLib/HT/CreateHTProcess.cpp
ProcessLib/HT/HTMaterialProperties.h
+1
-7
1 addition, 7 deletions
ProcessLib/HT/HTMaterialProperties.h
with
1 addition
and
14 deletions
ProcessLib/HT/CreateHTProcess.cpp
+
0
−
7
View file @
27a15c88
...
...
@@ -9,9 +9,7 @@
#include
"CreateHTProcess.h"
#include
"MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h"
#include
"MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h"
#include
"MaterialLib/PorousMedium/CreatePorousMediaProperties.h"
#include
"MeshLib/IO/readMeshFromFile.h"
#include
"ParameterLib/ConstantParameter.h"
#include
"ParameterLib/Utils.h"
...
...
@@ -81,10 +79,6 @@ std::unique_ptr<Process> createHTProcess(
const
int
_heat_transport_process_id
=
0
;
const
int
_hydraulic_process_id
=
1
;
MaterialLib
::
PorousMedium
::
PorousMediaProperties
porous_media_properties
{
MaterialLib
::
PorousMedium
::
createPorousMediaProperties
(
mesh
,
config
,
parameters
)};
// Parameter for the density of the solid.
auto
&
density_solid
=
ParameterLib
::
findParameter
<
double
>
(
config
,
...
...
@@ -170,7 +164,6 @@ std::unique_ptr<Process> createHTProcess(
std
::
unique_ptr
<
HTMaterialProperties
>
material_properties
=
std
::
make_unique
<
HTMaterialProperties
>
(
std
::
move
(
porous_media_properties
),
density_solid
,
std
::
move
(
media_map
),
specific_heat_capacity_solid
,
...
...
This diff is collapsed.
Click to expand it.
ProcessLib/HT/HTMaterialProperties.h
+
1
−
7
View file @
27a15c88
...
...
@@ -12,9 +12,7 @@
#include
<memory>
#include
<utility>
#include
"MaterialLib/Fluid/FluidProperties/FluidProperties.h"
#include
"MaterialLib/MPL/MaterialSpatialDistributionMap.h"
#include
"MaterialLib/PorousMedium/PorousMediaProperties.h"
namespace
ProcessLib
{
...
...
@@ -26,8 +24,6 @@ namespace HT
struct
HTMaterialProperties
final
{
HTMaterialProperties
(
MaterialLib
::
PorousMedium
::
PorousMediaProperties
&&
porous_media_properties_
,
ParameterLib
::
Parameter
<
double
>
const
&
density_solid_
,
std
::
unique_ptr
<
MaterialPropertyLib
::
MaterialSpatialDistributionMap
>&&
media_map_
,
...
...
@@ -38,8 +34,7 @@ struct HTMaterialProperties final
ParameterLib
::
Parameter
<
double
>
const
&
biot_constant_
,
Eigen
::
VectorXd
specific_body_force_
,
bool
const
has_gravity_
)
:
porous_media_properties
(
std
::
move
(
porous_media_properties_
)),
density_solid
(
density_solid_
),
:
density_solid
(
density_solid_
),
media_map
(
std
::
move
(
media_map_
)),
specific_heat_capacity_solid
(
specific_heat_capacity_solid_
),
thermal_conductivity_solid
(
thermal_conductivity_solid_
),
...
...
@@ -56,7 +51,6 @@ struct HTMaterialProperties final
void
operator
=
(
HTMaterialProperties
&&
)
=
delete
;
void
operator
=
(
HTMaterialProperties
const
&
)
=
delete
;
MaterialLib
::
PorousMedium
::
PorousMediaProperties
porous_media_properties
;
ParameterLib
::
Parameter
<
double
>
const
&
density_solid
;
std
::
unique_ptr
<
MaterialPropertyLib
::
MaterialSpatialDistributionMap
>
media_map
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment