Skip to content
Snippets Groups Projects
Commit fc46149a authored by Lars von Wolff's avatar Lars von Wolff
Browse files

Cleaned up for shared use

parent d9ac43e6
Branches porenetwork
No related tags found
No related merge requests found
...@@ -349,7 +349,7 @@ private: ...@@ -349,7 +349,7 @@ private:
void findStationaryState() void findStationaryState()
{ {
writeVTK(0); //writeVTK(0);
Dune::FieldVector<double,1> integral; Dune::FieldVector<double,1> integral;
param.reaction.reactionRate = 0; param.reaction.reactionRate = 0;
int iter = 0; int iter = 0;
...@@ -358,6 +358,7 @@ private: ...@@ -358,6 +358,7 @@ private:
do do
{ {
std::cout << "Find Stationary State, Iteration " << iter << " of (maximum) " << param.PCS_Search_MaxCHNSIter << std::endl;
iter++; iter++;
applyChPressureSaturation(1); applyChPressureSaturation(1);
applyNsPressureSaturation(1); applyNsPressureSaturation(1);
...@@ -440,14 +441,12 @@ public: ...@@ -440,14 +441,12 @@ public:
initializeGridOperators(); initializeGridOperators();
/* applyNs(); findStationaryState();
updatePhiSolid(); calculateKf();
updateSaturation();
initialPhiSolid = phiSolid; initialPhiSolid = phiSolid;
updateKf();
*/ std::cout << "Pn_2PFlow Initialized, initial Kf (viscosity ratio possibly not right)" << kf_11 << ", "
//findStationaryState();
updateKf();
std::cout << kf_11 << ", "
<< kf_12 << ", " << kf_12 << ", "
<< kf_21 << ", " << kf_21 << ", "
<< kf_22 << std::endl; << kf_22 << std::endl;
...@@ -640,6 +639,7 @@ void calculateKf(RF ViscosityRatio = 0) ...@@ -640,6 +639,7 @@ void calculateKf(RF ViscosityRatio = 0)
void findSaturation(RF Curvature) void findSaturation(RF Curvature)
{ {
std::cout << "Pn_2PFlow, function find Saturation not yet implemented" << std::endl;
//TODO!!!! //TODO!!!!
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment