mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 00:28:23 +01:00
SOLUTION_RAW: c++ version used in PHAST misinterpreted the
element Tc as the temperature identifier and crashed when additional elements followed in -totals or -activity_coefficients. Removed "tc" as an identifier for temperature. git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3613 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
parent
45d120f629
commit
ccd310298d
@ -554,7 +554,7 @@ cxxSolution::read_raw(CParser & parser)
|
|||||||
vopts.push_back("gammas"); // 2
|
vopts.push_back("gammas"); // 2
|
||||||
vopts.push_back("isotopes"); // 3
|
vopts.push_back("isotopes"); // 3
|
||||||
vopts.push_back("temp"); // 4
|
vopts.push_back("temp"); // 4
|
||||||
vopts.push_back("tc"); // 5
|
vopts.push_back("tc_avoid_conflict_with_technetium"); // 5
|
||||||
vopts.push_back("temperature"); // 6
|
vopts.push_back("temperature"); // 6
|
||||||
vopts.push_back("ph"); // 7
|
vopts.push_back("ph"); // 7
|
||||||
vopts.push_back("pe"); // 8
|
vopts.push_back("pe"); // 8
|
||||||
@ -673,7 +673,7 @@ cxxSolution::read_raw(CParser & parser)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 4: // temp
|
case 4: // temp
|
||||||
case 5: // tc
|
case 5: // tc_avoid_conflict_with_technetium
|
||||||
case 6: // temperature
|
case 6: // temperature
|
||||||
if (!(parser.get_iss() >> this->tc))
|
if (!(parser.get_iss() >> this->tc))
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user