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
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
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
Özgür Ozan Sen
ogs
Commits
b383d338
Commit
b383d338
authored
3 years ago
by
renchao.lu
Browse files
Options
Downloads
Patches
Plain Diff
[CL] Initialize the "fixing_pe" option.
parent
3be0c698
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChemistryLib/PhreeqcIOData/AqueousSolution.h
+6
-4
6 additions, 4 deletions
ChemistryLib/PhreeqcIOData/AqueousSolution.h
ChemistryLib/PhreeqcIOData/CreateAqueousSolution.cpp
+6
-2
6 additions, 2 deletions
ChemistryLib/PhreeqcIOData/CreateAqueousSolution.cpp
with
12 additions
and
6 deletions
ChemistryLib/PhreeqcIOData/AqueousSolution.h
+
6
−
4
View file @
b383d338
...
...
@@ -45,11 +45,12 @@ struct Component
struct
AqueousSolution
{
AqueousSolution
(
double
temperatur
e_
,
double
press
ure_
,
MeshLib
::
PropertyVector
<
double
>*
pe_
,
double
const
pe0_
,
std
::
vector
<
Component
>&&
components_
,
AqueousSolution
(
bool
const
fixing_p
e_
,
double
temperat
ure_
,
double
pressure_
,
MeshLib
::
PropertyVector
<
double
>*
pe_
,
double
const
pe0_
,
std
::
vector
<
Component
>&&
components_
,
ChargeBalance
charge_balance_
)
:
temperature
(
temperature_
),
:
fixing_pe
(
fixing_pe_
),
temperature
(
temperature_
),
pressure
(
pressure_
),
pe
(
pe_
),
pe0
(
pe0_
),
...
...
@@ -60,6 +61,7 @@ struct AqueousSolution
void
print
(
std
::
ostream
&
os
,
std
::
size_t
const
chemical_system_id
)
const
;
bool
const
fixing_pe
;
double
const
temperature
;
double
const
pressure
;
std
::
unique_ptr
<
GlobalVector
>
pH
;
...
...
This diff is collapsed.
Click to expand it.
ChemistryLib/PhreeqcIOData/CreateAqueousSolution.cpp
+
6
−
2
View file @
b383d338
...
...
@@ -23,6 +23,9 @@ namespace PhreeqcIOData
std
::
unique_ptr
<
AqueousSolution
>
createAqueousSolution
(
BaseLib
::
ConfigTree
const
&
config
,
MeshLib
::
Mesh
&
mesh
)
{
//! \ogs_file_attr{prj__chemical_system__solution__fixing_pe}
auto
const
fixing_pe
=
config
.
getConfigAttribute
<
bool
>
(
"fixing_pe"
,
false
);
//! \ogs_file_param{prj__chemical_system__solution__temperature}
auto
const
temperature
=
config
.
getConfigParameter
<
double
>
(
"temperature"
);
...
...
@@ -39,8 +42,9 @@ std::unique_ptr<AqueousSolution> createAqueousSolution(
auto
charge_balance
=
createChargeBalance
(
config
);
return
std
::
make_unique
<
AqueousSolution
>
(
temperature
,
pressure
,
pe
,
pe0
,
std
::
move
(
components
),
charge_balance
);
return
std
::
make_unique
<
AqueousSolution
>
(
fixing_pe
,
temperature
,
pressure
,
pe
,
pe0
,
std
::
move
(
components
),
charge_balance
);
}
}
// namespace PhreeqcIOData
}
// namespace ChemistryLib
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