Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
77
Issue boards
Milestones
Wiki
Code
Merge requests
77
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
dumux-repositories
dumux
Merge requests
!2539
[test][solidenergy] Separate properties into their own header
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
[test][solidenergy] Separate properties into their own header
feature/separate-properties-solidenergy
into
master
Overview
0
Commits
1
Pipelines
0
Changes
4
Merged
Timo Koch
requested to merge
feature/separate-properties-solidenergy
into
master
3 years ago
Overview
0
Commits
1
Pipelines
0
Changes
4
Expand
👍
0
👎
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
4483e5ba
1 commit,
3 years ago
4 files
+
65
−
40
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
test/porousmediumflow/solidenergy/main.cc
+
3
−
38
Options
@@ -5,7 +5,7 @@
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version
2
of the License, or *
* the Free Software Foundation, either version
3
of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
@@ -23,9 +23,7 @@
*/
#include
<config.h>
#include
<ctime>
#include
<iostream>
#include
<tuple>
#include
<dune/common/parallel/mpihelper.hh>
#include
<dune/common/timer.hh>
@@ -42,42 +40,9 @@
#include
<dumux/assembly/diffmethod.hh>
#include
<dumux/io/vtkoutputmodule.hh>
#include
<dumux/io/grid/gridmanager.hh>
#include
<dumux/io/grid/gridmanager
_yasp
.hh>
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/porousmediumflow/solidenergy/model.hh>
#include
"problem.hh"
#include
"spatialparams.hh"
namespace
Dumux
{
namespace
Properties
{
// Create new type tags
namespace
TTag
{
struct
SolidEnergyTest
{
using
InheritsFrom
=
std
::
tuple
<
SolidEnergy
,
CCTpfaModel
>
;
};
}
// end namespace TTag
// Set the grid type
template
<
class
TypeTag
>
struct
Grid
<
TypeTag
,
TTag
::
SolidEnergyTest
>
{
using
type
=
Dune
::
YaspGrid
<
2
>
;
};
// Set the problem property
template
<
class
TypeTag
>
struct
Problem
<
TypeTag
,
TTag
::
SolidEnergyTest
>
{
using
type
=
SolidEnergyProblem
<
TypeTag
>
;
};
// Set the spatial parameters
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
SolidEnergyTest
>
{
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
SolidEnergySpatialParams
<
GridGeometry
,
Scalar
>
;
};
}
// end namespace Properties
}
// end namespace Dumux
#include
"properties.hh"
int
main
(
int
argc
,
char
**
argv
)
{
Loading