max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added pr_in to C++ gas_phase class.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5900 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-12-15 16:40:03 +00:00
parent 4ed743d04e
commit c46e48760e
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
GasPhase.cxx
View File

@ -28,6 +28,7 @@ cxxGasPhase::cxxGasPhase(PHRQ_io * io)
total_p = 0;
volume = 0;
v_m = 0;
pr_in = false;
gasPhaseComps.type = cxxNameDouble::ND_NAME_COEF;
}
@ -54,6 +55,7 @@ cxxNumKeyword(io)
total_p = gas_phase_ptr->total_p;
volume = gas_phase_ptr->volume;
v_m = gas_phase_ptr->v_m;
pr_in = gas_phase_ptr->pr_in;
// gas_phase components
for (i = 0; i < gas_phase_ptr->count_comps; i++)
@ -73,6 +75,7 @@ cxxNumKeyword(io)
total_p = 0;
volume = 0;
v_m = 0;
pr_in = false;
bool first = true;
//
// Mix
@ -97,6 +100,7 @@ cxxNumKeyword(io)
this->total_p = entity_ptr->total_p * it->second;
this->volume = entity_ptr->volume * it->second;
this->v_m = entity_ptr->v_m * it->second;
this->pr_in = entity_ptr->pr_in;
first = false;
}
else
@ -189,6 +193,9 @@ cxxGasPhase::dump_raw(std::ostream & s_oss, unsigned int indent, int *n_out) con
s_oss << indent1;
s_oss << "-v_m " << this->v_m << std::endl;
s_oss << indent1;
s_oss << "-pr_in " << (this->pr_in ? 1 : 0) << std::endl;
// gasPhaseComps
s_oss << indent1;
s_oss << "-component" << std::endl;
@ -210,6 +217,7 @@ cxxGasPhase::read_raw(CParser & parser, bool check)
vopts.push_back("v_m"); //3
vopts.push_back("component"); //4
vopts.push_back("pressure"); //5
vopts.push_back("pr_in"); //6
}
std::istream::pos_type ptr;
@ -226,6 +234,7 @@ cxxGasPhase::read_raw(CParser & parser, bool check)
bool total_p_defined(false);
bool volume_defined(false);
bool v_m_defined(false);
bool pr_in_defined(false);
for (;;)
{
@ -324,6 +333,19 @@ cxxGasPhase::read_raw(CParser & parser, bool check)
opt_save = 4;
useLastLine = false;
break;
case 6: // pr_in
if (!(parser.get_iss() >> i))
{
parser.incr_input_error();
parser.error_msg("Expected 0/1 for pr_in.", CParser::OT_CONTINUE);
}
else
{
this->pr_in = (i == 0) ? false : true;
}
pr_in_defined = true;
useLastLine = false;
break;
}
if (opt == CParser::OPT_EOF || opt == CParser::OPT_KEYWORD)
break;
@ -355,6 +377,12 @@ cxxGasPhase::read_raw(CParser & parser, bool check)
parser.error_msg("V_m not defined for GAS_PHASE_RAW input.",
CParser::OT_CONTINUE);
}
if (pr_in_defined == false)
{
parser.incr_input_error();
parser.error_msg("Pr_in not defined for GAS_PHASE_RAW input.",
CParser::OT_CONTINUE);
}
}
}
@ -376,6 +404,7 @@ cxxGasPhase::mpi_pack(std::vector < int >&ints,
doubles.push_back(this->total_p);
doubles.push_back(this->volume);
doubles.push_back(this->v_m);
ints.push_back((pr_in) ? 1 : 0);
}
void
@ -399,6 +428,8 @@ cxxGasPhase::mpi_unpack(int *ints, int *ii, double *doubles, int *dd)
this->total_p = doubles[d++];
this->volume = doubles[d++];
this->v_m = doubles[d++];
n = ints[i++];
this->pr_in = (n == 1) ? true : false;
*ii = i;
*dd = d;
}

2
GasPhase.h
View File

@ -50,6 +50,7 @@ class cxxGasPhase:public cxxNumKeyword
double Get_total_p(void) const {return total_p;};
double Get_volume(void) const {return volume;};
double Get_v_m(void) const {return v_m;};
bool Get_pr_in(void) const {return pr_in;};
cxxNameDouble & Get_totals(void) {return totals;};
protected:
@ -61,6 +62,7 @@ protected:
double total_p;
double volume;
double v_m;
bool pr_in;
cxxNameDouble totals;
};