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

Merge commit 'ff1bded8415c84af23ef99cbd47c0a9ef7a69a76'

Browse Source
This commit is contained in:
Darth Vader 2025-02-18 20:26:35 +00:00
commit 6c58153c18
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/phreeqcpp/GasComp.cxx
View File

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