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

Squashed 'phreeqcpp/' changes from c81916a..a4886d6

Browse Source 
a4886d6 Added simela.dat-from Peter de Moel. Fixed bug in write_raw/read_raw GasComp, order of options

git-subtree-dir: phreeqcpp
git-subtree-split: a4886d603340240f6632bf46ddf256881eac58f9
This commit is contained in:
Darth Vader 2025-02-18 20:25:42 +00:00
parent 7afa475511
commit 7c05598ee3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
GasComp.cxx
View File

@ -99,7 +99,7 @@ cxxGasComp::read_raw(CParser & parser, bool check)
// Allow return to Exchange for more processing
break;
case 0: // phase_name
case 7: // phase_name
output_msg("-phase_name is obsolete. Define with -component\n");
break;
@ -138,7 +138,7 @@ cxxGasComp::read_raw(CParser & parser, bool check)
}
break;
case 5: // p
case 0: // p
if (!(parser.get_iss() >> this->p))
{
this->p = 0;
@ -148,7 +148,7 @@ cxxGasComp::read_raw(CParser & parser, bool check)
}
break;
case 6: // phi
case 5: // phi
if (!(parser.get_iss() >> this->phi))
{
this->phi = 0;
@ -158,7 +158,7 @@ cxxGasComp::read_raw(CParser & parser, bool check)
}
break;
case 7: // f
case 6: // f
if (!(parser.get_iss() >> this->f))
{
this->f = 0;
@ -253,13 +253,13 @@ cxxGasComp::Deserialize(Dictionary & dictionary, std::vector < int >&ints,
}
const std::vector< std::string >::value_type temp_vopts[] = {
std::vector< std::string >::value_type("phase_name"), // 0
std::vector< std::string >::value_type("p"), // 0
std::vector< std::string >::value_type("name"), // 1
std::vector< std::string >::value_type("p_read"), // 2
std::vector< std::string >::value_type("moles"), // 3
std::vector< std::string >::value_type("initial_moles"), // 4
std::vector< std::string >::value_type("p"), // 5
std::vector< std::string >::value_type("phi"), // 6
std::vector< std::string >::value_type("f") // 7
std::vector< std::string >::value_type("phi"), // 5
std::vector< std::string >::value_type("f"), // 6
std::vector< std::string >::value_type("phase_name") // 7
};
const std::vector< std::string > cxxGasComp::vopts(temp_vopts, temp_vopts + sizeof temp_vopts / sizeof temp_vopts[0]);