Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CFiniteElementStd::CalcSaturation] Initialize mfp_vector[i]->Fem_Ele_Std for variable dependent fluid properties #108

Merged
merged 2 commits into from
Aug 22, 2018
Merged

[CFiniteElementStd::CalcSaturation] Initialize mfp_vector[i]->Fem_Ele_Std for variable dependent fluid properties #108

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6819eb9
[CFiniteElementStd::CalcSaturation] Initialize mfp_vector[i]->Fem_Ele…
wenqing Aug 21, 2018
1d9c60f
[CFiniteElementStd::CalcSaturation] Use SetMaterial() to replace some…
wenqing Aug 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions FEM/fem_ele_std.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9554,6 +9554,12 @@ void CFiniteElementStd::CalcSaturation(MeshLib::CElem& elem)
MediaProp = mmp_vector[mmp_index];
MediaProp->m_pcs = pcs;
MediaProp->Fem_Ele_Std = this;
// For variable dependent fluid models, which needs variable interpolation.
for (std::size_t i=0; i < mfp_vector.size(); i++)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not use CFiniteElementStd::SetMaterial(int phase)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Changed accordingly.

{
mfp_vector[i]->Fem_Ele_Std = this;
}

// CB_merge_0513
double* tens = MediaProp->PermeabilityTensor(Index);
//
Expand Down