Skip to content

Commit

Permalink
Merge pull request #10 from rest-for-physics/cris_newGases
Browse files Browse the repository at this point in the history 
New gases definitions
  • Loading branch information
@cmargalejo
cmargalejo authored Oct 3, 2024
2 parents 9cbf4ec + 4d5dbe0 commit bc721ce
Show file tree
Hide file tree
Showing 3 changed files with 286 additions and 11 deletions.
113 changes: 108 additions & 5 deletions definitions/gases.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,15 @@
<fraction n="0.01774549509" ref="IsobutaneGas" />
</material>

<!-- Mixtures at different pressures -->

<material name="XenonNeon2.3%Isobutane1.05bar" state="gas">
<D unit="kg/m3" value="3.1908975" />
<material name="XenonNeon5%Isobutane1bar" state="gas">
<D unit="kg/m3" value="3.01977" />
<T unit="K" value="298.15" />
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar" />
<fraction n="0.961177731" ref="Xenon50Neon50Gas" />
<fraction n="0.038822269" ref="IsobutaneGas" />
</material>

<!-- Mixtures at different pressures -->

<material name="Argon1%Isobutane1.2bar" state="gas">
<D unit="kg/m3" value="1.942584" />
<T unit="K" value="298.15" />
Expand Down Expand Up @@ -167,6 +168,42 @@
<fraction n="1" ref="Argon10%Isobutane1bar" />
</material>

<material name="Argon1%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.42836" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon1%Isobutane1bar" />
</material>

<material name="Argon2%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.43936" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon2%Isobutane1bar" />
</material>

<material name="Argon3%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.45036" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon3%Isobutane1bar" />
</material>

<material name="Argon4%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.46136" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon4%Isobutane1bar" />
</material>

<material name="Argon5%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.47235" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon5%Isobutane1bar" />
</material>

<material name="Argon10%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.52735" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon10%Isobutane1bar" />
</material>

<material name="Argon1%Isobutane1.6bar" state="gas">
<D unit="kg/m3" value="2.590112" />
<T unit="K" value="298.15" />
Expand Down Expand Up @@ -203,4 +240,70 @@
<fraction n="1" ref="Argon10%Isobutane1bar" />
</material>

<material name="Argon1%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.23781" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon1%Isobutane1bar" />
</material>

<material name="Argon2%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.25248" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon2%Isobutane1bar" />
</material>

<material name="Argon3%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.26714" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon3%Isobutane1bar" />
</material>

<material name="Argon4%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.28181" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon4%Isobutane1bar" />
</material>

<material name="Argon5%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.29647" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon5%Isobutane1bar" />
</material>

<material name="Argon10%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.36980" />
<T unit="K" value="298.15" />
<fraction n="1" ref="Argon10%Isobutane1bar" />
</material>

<material name="XenonNeon2.3%Isobutane1.05bar" state="gas">
<D unit="kg/m3" value="3.1908975" />
<T unit="K" value="298.15" />
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar" />
</material>

<material name="XenonNeon2.3%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="4.55850" />
<T unit="K" value="298.15" />
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar" />
</material>

<material name="XenonNeon2.3%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="6.07800" />
<T unit="K" value="298.15" />
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar" />
</material>

<material name="XenonNeon5%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="4.52972" />
<T unit="K" value="298.15" />
<fraction n="1" ref="XenonNeon5%Isobutane1bar" />
</material>

<material name="XenonNeon5%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="6.03963" />
<T unit="K" value="298.15" />
<fraction n="1" ref="XenonNeon5%Isobutane1bar" />
</material>

</materials>
92 changes: 89 additions & 3 deletions output/materials.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3765,10 +3765,11 @@
<fraction n="0.98225450491" ref="Xenon50Neon50Gas"/>
<fraction n="0.01774549509" ref="IsobutaneGas"/>
</material>
<material name="XenonNeon2.3%Isobutane1.05bar" state="gas">
<D unit="kg/m3" value="3.1908975"/>
<material name="XenonNeon5%Isobutane1bar" state="gas">
<D unit="kg/m3" value="3.01977"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar"/>
<fraction n="0.961177731" ref="Xenon50Neon50Gas"/>
<fraction n="0.038822269" ref="IsobutaneGas"/>
</material>
<material name="Argon1%Isobutane1.2bar" state="gas">
<D unit="kg/m3" value="1.942584"/>
Expand Down Expand Up @@ -3830,6 +3831,36 @@
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon10%Isobutane1bar"/>
</material>
<material name="Argon1%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.42836"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon1%Isobutane1bar"/>
</material>
<material name="Argon2%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.43936"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon2%Isobutane1bar"/>
</material>
<material name="Argon3%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.45036"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon3%Isobutane1bar"/>
</material>
<material name="Argon4%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.46136"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon4%Isobutane1bar"/>
</material>
<material name="Argon5%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.47235"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon5%Isobutane1bar"/>
</material>
<material name="Argon10%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.52735"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon10%Isobutane1bar"/>
</material>
<material name="Argon1%Isobutane1.6bar" state="gas">
<D unit="kg/m3" value="2.590112"/>
<T unit="K" value="298.15"/>
Expand Down Expand Up @@ -3860,6 +3891,61 @@
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon10%Isobutane1bar"/>
</material>
<material name="Argon1%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.23781"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon1%Isobutane1bar"/>
</material>
<material name="Argon2%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.25248"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon2%Isobutane1bar"/>
</material>
<material name="Argon3%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.26714"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon3%Isobutane1bar"/>
</material>
<material name="Argon4%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.28181"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon4%Isobutane1bar"/>
</material>
<material name="Argon5%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.29647"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon5%Isobutane1bar"/>
</material>
<material name="Argon10%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.36980"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon10%Isobutane1bar"/>
</material>
<material name="XenonNeon2.3%Isobutane1.05bar" state="gas">
<D unit="kg/m3" value="3.1908975"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar"/>
</material>
<material name="XenonNeon2.3%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="4.55850"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar"/>
</material>
<material name="XenonNeon2.3%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="6.07800"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar"/>
</material>
<material name="XenonNeon5%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="4.52972"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon5%Isobutane1bar"/>
</material>
<material name="XenonNeon5%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="6.03963"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon5%Isobutane1bar"/>
</material>
<material name="Copper" state="solid">
<D value="8.96000e+00" unit="g/cm3"/>
<fraction n="1.000000" ref="Cu"/>
Expand Down
92 changes: 89 additions & 3 deletions output/rest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3235,10 +3235,11 @@
<fraction n="0.98225450491" ref="Xenon50Neon50Gas"/>
<fraction n="0.01774549509" ref="IsobutaneGas"/>
</material>
<material name="XenonNeon2.3%Isobutane1.05bar" state="gas">
<D unit="kg/m3" value="3.1908975"/>
<material name="XenonNeon5%Isobutane1bar" state="gas">
<D unit="kg/m3" value="3.01977"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar"/>
<fraction n="0.961177731" ref="Xenon50Neon50Gas"/>
<fraction n="0.038822269" ref="IsobutaneGas"/>
</material>
<material name="Argon1%Isobutane1.2bar" state="gas">
<D unit="kg/m3" value="1.942584"/>
Expand Down Expand Up @@ -3300,6 +3301,36 @@
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon10%Isobutane1bar"/>
</material>
<material name="Argon1%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.42836"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon1%Isobutane1bar"/>
</material>
<material name="Argon2%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.43936"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon2%Isobutane1bar"/>
</material>
<material name="Argon3%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.45036"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon3%Isobutane1bar"/>
</material>
<material name="Argon4%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.46136"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon4%Isobutane1bar"/>
</material>
<material name="Argon5%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.47235"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon5%Isobutane1bar"/>
</material>
<material name="Argon10%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="2.52735"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon10%Isobutane1bar"/>
</material>
<material name="Argon1%Isobutane1.6bar" state="gas">
<D unit="kg/m3" value="2.590112"/>
<T unit="K" value="298.15"/>
Expand Down Expand Up @@ -3330,6 +3361,61 @@
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon10%Isobutane1bar"/>
</material>
<material name="Argon1%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.23781"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon1%Isobutane1bar"/>
</material>
<material name="Argon2%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.25248"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon2%Isobutane1bar"/>
</material>
<material name="Argon3%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.26714"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon3%Isobutane1bar"/>
</material>
<material name="Argon4%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.28181"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon4%Isobutane1bar"/>
</material>
<material name="Argon5%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.29647"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon5%Isobutane1bar"/>
</material>
<material name="Argon10%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="3.36980"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="Argon10%Isobutane1bar"/>
</material>
<material name="XenonNeon2.3%Isobutane1.05bar" state="gas">
<D unit="kg/m3" value="3.1908975"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar"/>
</material>
<material name="XenonNeon2.3%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="4.55850"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar"/>
</material>
<material name="XenonNeon2.3%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="6.07800"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon2.3%Isobutane1bar"/>
</material>
<material name="XenonNeon5%Isobutane1.5bar" state="gas">
<D unit="kg/m3" value="4.52972"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon5%Isobutane1bar"/>
</material>
<material name="XenonNeon5%Isobutane2.0bar" state="gas">
<D unit="kg/m3" value="6.03963"/>
<T unit="K" value="298.15"/>
<fraction n="1" ref="XenonNeon5%Isobutane1bar"/>
</material>
<material name="TMA" state="gas">
<D unit="mg/cm3" value="quencherDensity"/>
<T unit="K" value="gasTemperature"/>
Expand Down

0 comments on commit bc721ce

Please sign in to comment.