git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3844 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2009-12-03 01:06:34 +00:00
parent 9f7e982ffe
commit 51183867e4
3 changed files with 923 additions and 923 deletions

1510
System.cxx

File diff suppressed because it is too large Load Diff

196
phast.xsd
View File

@ -1,98 +1,98 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>
<xs:element name="phast_state">
<xs:complexType>
<xs:sequence>
<xs:element ref="system" minOccurs='0' maxOccurs='unbounded'/>
</xs:sequence>
<xs:attribute name="nx" type="xs:integer" use='required'/>
</xs:complexType>
</xs:element>
<xs:element name="system">
<xs:complexType>
<xs:sequence>
<xs:element ref="solution" minOccurs='0' maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="system_number" type="xs:integer" use='required'/>
</xs:complexType>
</xs:element>
<xs:element name="solution">
<xs:complexType>
<xs:sequence>
<xs:element ref="soln_pe" minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref="soln_total" minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref="soln_m_a" minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref="soln_s_g" minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref="soln_isotopes" minOccurs='0' maxOccurs='unbounded'/>
</xs:sequence>
<xs:attribute name="soln_new_def" type="xs:integer" use='required'/>
<xs:attribute name="soln_n_user" type="xs:integer" use='required'/>
<xs:attribute name="soln_n_user_end" type="xs:integer" use='required'/>
<xs:attribute name="soln_description" type="xs:string" use='required'/>
<xs:attribute name="soln_tc" type="xs:double" use='required'/>
<xs:attribute name="soln_ph" type="xs:double" use='required'/>
<xs:attribute name="soln_solution_pe" type="xs:double" use='required'/>
<xs:attribute name="soln_mu" type="xs:double" use='required'/>
<xs:attribute name="soln_ah2o" type="xs:double" use='required'/>
<xs:attribute name="soln_density" type="xs:double" use='required'/>
<xs:attribute name="soln_total_h" type="xs:double" use='required'/>
<xs:attribute name="soln_total_o" type="xs:double" use='required'/>
<xs:attribute name="soln_cb" type="xs:double" use='required'/>
<xs:attribute name="soln_mass_water" type="xs:double" use='required'/>
<xs:attribute name="soln_total_alkalinity" type="xs:double" use='required'/>
<xs:attribute name="soln_total_co2" type="xs:double" use='required'/>
<xs:attribute name="soln_units" type="xs:string" use='required'/>
<xs:attribute name="soln_default_pe" type="xs:integer" use='required'/>
<xs:attribute name="soln_count_master_activity" type="xs:integer" use='required'/>
<xs:attribute name="soln_count_isotopes" type="xs:integer" use='required'/>
<xs:attribute name="soln_count_species_gamma" type="xs:integer" use='required'/>
</xs:complexType>
</xs:element>
<xs:element name="soln_pe">
<xs:complexType>
<xs:attribute name="soln_pe_name" type="xs:string" use='required'/>
</xs:complexType>
</xs:element>
<xs:element name="soln_total">
<xs:complexType>
<xs:attributeGroup ref="conc" />
</xs:complexType>
</xs:element>
<xs:attributeGroup name="conc">
<xs:attribute name="conc_desc" type="xs:string" use='required'/>
<xs:attribute name="conc_moles" type="xs:double" use='required'/>
<xs:attribute name="conc_input_conc" type="xs:double" />
<xs:attribute name="conc_units" type="xs:string" />
<xs:attribute name="conc_equation_name" type="xs:string" />
<xs:attribute name="conc_phase_si" type="xs:double" />
<xs:attribute name="conc_n_pe" type="xs:integer" use='required'/>
<xs:attribute name="conc_as" type="xs:string" />
<xs:attribute name="conc_gfw" type="xs:double" />
</xs:attributeGroup>
<xs:attributeGroup name="master_activity">
<xs:attribute name="m_a_desc" type="xs:string" use='required'/>
<xs:attribute name="m_a_la" type="xs:double" use='required'/>
</xs:attributeGroup>
<xs:element name="soln_m_a">
<xs:complexType>
<xs:attributeGroup ref="master_activity" />
</xs:complexType>
</xs:element>
<xs:element name="soln_s_g">
<xs:complexType>
<xs:attributeGroup ref="master_activity" />
</xs:complexType>
</xs:element>
<xs:element name="soln_isotopes">
<xs:complexType>
<xs:attribute name="iso_isotope_number" type="xs:integer" use='required'/>
<xs:attribute name="iso_elt_name" type="xs:string" use='required'/>
<xs:attribute name="iso_isotope_name" type="xs:string" use='required'/>
<xs:attribute name="iso_total" type="xs:double" use='required'/>
<xs:attribute name="iso_ratio" type="xs:double" use='required'/>
<xs:attribute name="iso_ratio_uncertainty" type="xs:double" use='required'/>
<xs:attribute name="iso_coef" type="xs:double" use='required'/>
</xs:complexType>
</xs:element>
</xs:schema>
<?xml version="1.0"?>
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>
<xs:element name="phast_state">
<xs:complexType>
<xs:sequence>
<xs:element ref="system" minOccurs='0' maxOccurs='unbounded'/>
</xs:sequence>
<xs:attribute name="nx" type="xs:integer" use='required'/>
</xs:complexType>
</xs:element>
<xs:element name="system">
<xs:complexType>
<xs:sequence>
<xs:element ref="solution" minOccurs='0' maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="system_number" type="xs:integer" use='required'/>
</xs:complexType>
</xs:element>
<xs:element name="solution">
<xs:complexType>
<xs:sequence>
<xs:element ref="soln_pe" minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref="soln_total" minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref="soln_m_a" minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref="soln_s_g" minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref="soln_isotopes" minOccurs='0' maxOccurs='unbounded'/>
</xs:sequence>
<xs:attribute name="soln_new_def" type="xs:integer" use='required'/>
<xs:attribute name="soln_n_user" type="xs:integer" use='required'/>
<xs:attribute name="soln_n_user_end" type="xs:integer" use='required'/>
<xs:attribute name="soln_description" type="xs:string" use='required'/>
<xs:attribute name="soln_tc" type="xs:double" use='required'/>
<xs:attribute name="soln_ph" type="xs:double" use='required'/>
<xs:attribute name="soln_solution_pe" type="xs:double" use='required'/>
<xs:attribute name="soln_mu" type="xs:double" use='required'/>
<xs:attribute name="soln_ah2o" type="xs:double" use='required'/>
<xs:attribute name="soln_density" type="xs:double" use='required'/>
<xs:attribute name="soln_total_h" type="xs:double" use='required'/>
<xs:attribute name="soln_total_o" type="xs:double" use='required'/>
<xs:attribute name="soln_cb" type="xs:double" use='required'/>
<xs:attribute name="soln_mass_water" type="xs:double" use='required'/>
<xs:attribute name="soln_total_alkalinity" type="xs:double" use='required'/>
<xs:attribute name="soln_total_co2" type="xs:double" use='required'/>
<xs:attribute name="soln_units" type="xs:string" use='required'/>
<xs:attribute name="soln_default_pe" type="xs:integer" use='required'/>
<xs:attribute name="soln_count_master_activity" type="xs:integer" use='required'/>
<xs:attribute name="soln_count_isotopes" type="xs:integer" use='required'/>
<xs:attribute name="soln_count_species_gamma" type="xs:integer" use='required'/>
</xs:complexType>
</xs:element>
<xs:element name="soln_pe">
<xs:complexType>
<xs:attribute name="soln_pe_name" type="xs:string" use='required'/>
</xs:complexType>
</xs:element>
<xs:element name="soln_total">
<xs:complexType>
<xs:attributeGroup ref="conc" />
</xs:complexType>
</xs:element>
<xs:attributeGroup name="conc">
<xs:attribute name="conc_desc" type="xs:string" use='required'/>
<xs:attribute name="conc_moles" type="xs:double" use='required'/>
<xs:attribute name="conc_input_conc" type="xs:double" />
<xs:attribute name="conc_units" type="xs:string" />
<xs:attribute name="conc_equation_name" type="xs:string" />
<xs:attribute name="conc_phase_si" type="xs:double" />
<xs:attribute name="conc_n_pe" type="xs:integer" use='required'/>
<xs:attribute name="conc_as" type="xs:string" />
<xs:attribute name="conc_gfw" type="xs:double" />
</xs:attributeGroup>
<xs:attributeGroup name="master_activity">
<xs:attribute name="m_a_desc" type="xs:string" use='required'/>
<xs:attribute name="m_a_la" type="xs:double" use='required'/>
</xs:attributeGroup>
<xs:element name="soln_m_a">
<xs:complexType>
<xs:attributeGroup ref="master_activity" />
</xs:complexType>
</xs:element>
<xs:element name="soln_s_g">
<xs:complexType>
<xs:attributeGroup ref="master_activity" />
</xs:complexType>
</xs:element>
<xs:element name="soln_isotopes">
<xs:complexType>
<xs:attribute name="iso_isotope_number" type="xs:integer" use='required'/>
<xs:attribute name="iso_elt_name" type="xs:string" use='required'/>
<xs:attribute name="iso_isotope_name" type="xs:string" use='required'/>
<xs:attribute name="iso_total" type="xs:double" use='required'/>
<xs:attribute name="iso_ratio" type="xs:double" use='required'/>
<xs:attribute name="iso_ratio_uncertainty" type="xs:double" use='required'/>
<xs:attribute name="iso_coef" type="xs:double" use='required'/>
</xs:complexType>
</xs:element>
</xs:schema>

140
test.xml
View File

@ -1,70 +1,70 @@
<?xml version="1.0" ?>
<phast_state nx="2">
<system system_number="1">
<solution
soln_new_def="0"
soln_n_user="2"
soln_n_user_end="2"
soln_description="Test solution"
soln_tc="25.0"
soln_ph="6.3"
soln_solution_pe="4.5"
soln_mu="0.0011"
soln_ah2o="0.995"
soln_density="1.0"
soln_total_h="111.1"
soln_total_o="55.5"
soln_cb="1e-15"
soln_mass_water="1.0"
soln_total_alkalinity="0.001"
soln_total_co2="0.002"
soln_units="mg/L"
soln_default_pe="0"
soln_count_totals="2"
soln_count_master_activity="2"
soln_count_isotopes="0"
soln_count_species_gamma="0">
<soln_pe soln_pe_name="Fe(2)/Fe(3)"/>
<soln_total
conc_desc="Ca"
conc_moles="0.001"
conc_input_conc="0.001"
conc_equation_name="Fe(2)/Fe(3)"
conc_phase_si="0.0"
conc_n_pe="0"
conc_as="mg/L"
conc_gfw="40.08"/>
<soln_total
conc_desc="Na"
conc_moles="0.001"
conc_input_conc="0.001"
conc_equation_name="Fe(2)/Fe(3)"
conc_phase_si="0.0"
conc_n_pe="0"
conc_as="mg/L"
conc_gfw="40.08"/>
<soln_m_a m_a_desc="Ca+2" m_a_la="-3.0"/>
<soln_m_a m_a_desc="Cl-" m_a_la="-3.0"/>
<soln_m_a m_a_desc="C" m_a_la="-3.0"/>
<soln_s_g m_a_desc="CO3-2" m_a_la=".1"/>
<soln_s_g m_a_desc="HCO3-" m_a_la=".2"/>
<soln_s_g m_a_desc="CO2" m_a_la=".3"/>
<soln_isotopes
iso_isotope_number="2"
iso_elt_name="H"
iso_isotope_name="D"
iso_total="1e-6"
iso_ratio="11."
iso_ratio_uncertainty="0.5"
iso_coef="2.2"/>
<soln_isotopes
iso_isotope_number="3"
iso_elt_name="H"
iso_isotope_name="T"
iso_total="1e-14"
iso_ratio="3.1"
iso_ratio_uncertainty="0.25"
iso_coef="2.1"/>
</solution>
</system>
</phast_state>
<?xml version="1.0" ?>
<phast_state nx="2">
<system system_number="1">
<solution
soln_new_def="0"
soln_n_user="2"
soln_n_user_end="2"
soln_description="Test solution"
soln_tc="25.0"
soln_ph="6.3"
soln_solution_pe="4.5"
soln_mu="0.0011"
soln_ah2o="0.995"
soln_density="1.0"
soln_total_h="111.1"
soln_total_o="55.5"
soln_cb="1e-15"
soln_mass_water="1.0"
soln_total_alkalinity="0.001"
soln_total_co2="0.002"
soln_units="mg/L"
soln_default_pe="0"
soln_count_totals="2"
soln_count_master_activity="2"
soln_count_isotopes="0"
soln_count_species_gamma="0">
<soln_pe soln_pe_name="Fe(2)/Fe(3)"/>
<soln_total
conc_desc="Ca"
conc_moles="0.001"
conc_input_conc="0.001"
conc_equation_name="Fe(2)/Fe(3)"
conc_phase_si="0.0"
conc_n_pe="0"
conc_as="mg/L"
conc_gfw="40.08"/>
<soln_total
conc_desc="Na"
conc_moles="0.001"
conc_input_conc="0.001"
conc_equation_name="Fe(2)/Fe(3)"
conc_phase_si="0.0"
conc_n_pe="0"
conc_as="mg/L"
conc_gfw="40.08"/>
<soln_m_a m_a_desc="Ca+2" m_a_la="-3.0"/>
<soln_m_a m_a_desc="Cl-" m_a_la="-3.0"/>
<soln_m_a m_a_desc="C" m_a_la="-3.0"/>
<soln_s_g m_a_desc="CO3-2" m_a_la=".1"/>
<soln_s_g m_a_desc="HCO3-" m_a_la=".2"/>
<soln_s_g m_a_desc="CO2" m_a_la=".3"/>
<soln_isotopes
iso_isotope_number="2"
iso_elt_name="H"
iso_isotope_name="D"
iso_total="1e-6"
iso_ratio="11."
iso_ratio_uncertainty="0.5"
iso_coef="2.2"/>
<soln_isotopes
iso_isotope_number="3"
iso_elt_name="H"
iso_isotope_name="T"
iso_total="1e-14"
iso_ratio="3.1"
iso_ratio_uncertainty="0.25"
iso_coef="2.1"/>
</solution>
</system>
</phast_state>