<!--

       Copyright 2011 Peter Murray-Rust et. al.

       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at

           http://www.apache.org/licenses/LICENSE-2.0

       Unless required by applicable law or agreed to in writing, software
       distributed under the License is distributed on an "AS IS" BASIS,
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
       See the License for the specific language governing permissions and
       limitations under the License.

-->

<<<<<<< .working
<unitList
    namespace="http://www.uam.es/siesta/units"
    type="unit"
    xmlns:h="http://www.w3.org/1999/xhtml"
    dictionaryPrefix="siestaUnits"
    title="Siesta units dictionary"
    xmlns:si="http://xml-cml.org/dict/siUnits"
    xmlns:unitType="http://xml-cml.org/units/unitTypes"
    xmlns:siestaUnits="http://www.uam.es/siesta/units"
    xmlns="http://www.xml-cml.org/schema"
>

  <unit id="ry" 
    title="Ry"
    multiplierToSI="1.0973731568525E+07" 
    symbol="Ry" 
    unitType="unitType:length-1">
      <metadata name="dc:source" content="Wikipedia"/>
    <definition>the "infinity" Rydberg constant</definition>
    <description>
<h:p>The Rydberg constant is named after physicist Janne Rydberg, and 
is a physical constant discovered when measuring the spectrum of hydrogen, 
and building upon results from Anders Jonas Angstrom and Johann Balmer. 
Each chemical element has its own Rydberg constant, which can be 
derived from the "infinity" Rydberg constant.</h:p>
<h:p>The "infinity" Rydberg constant is (according to 2002 CODATA results):</h:p>
<h:p>This constant is often used in atomic physics in the form of an energy (see RyEnergy)</h:p>
    </description>
  </unit>
  
  <unit id="ryenergy" 
    title="Rydberg energy"
    multiplierToSI="-99" 
    symbol="Ry" 
    unitType="unitType:energy">
      <metadata name="dc:source" content="Wikipedia"/>
      <definition>energy equivalent of 1 Rydberg</definition>
    <description>
    <h:p>h * c * Ryinf = 13.6056923 eV</h:p>
<h:p>This constant is often used in atomic physics in the form of an energy</h:p>
    </description>
  </unit>

 
  <unit 
   id="bohr" 
   title="Bohr"
    multiplierToSI="-99" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
  
  <unit 
    id="ry.bohr" 
    title="Ry Bohr"
    multiplierToSI="-99" 
    symbol="Ry Bohr" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
  
  <unit 
  id="ry.bohr3" 
  title="Ry Bohr cubed" 
  parentSI="si:unknown"
    multiplierToSI="-99" 
    symbol="Ry.Bohr3" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
 
  <unit id="kbar" 
    title="kilobar" 
    parentSI="si:pa"
    multiplierToSI="-99" 
    symbol="kbar" 
    unitType="unitType:pressure">
    <description>pressure???
    </description>
  </unit>
  
  <unit 
  id="exx" 
  title="e__" 
  parentSI="si:unknown"
    multiplierToSI="-99" 
    symbol="e__" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
  
  <unit id="ev.ang-3"
  title="electron volts per angstrom cubed" 
  parentSI="si:unknown"
    multiplierToSI="-99" 
    symbol="eV.A-3" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
  
</unitList>
=======
<unitList
    namespace="http://www.uam.es/siesta/units"
    type="unit"
    xmlns:h="http://www.w3.org/1999/xhtml"
    dictionaryPrefix="siestaUnits"
    title="Siesta units dictionary"
    xmlns:si="http://xml-cml.org/dict/siUnits"
    xmlns:unitType="http://xml-cml.org/units/unitTypes"
    xmlns:siestaUnits="http://www.uam.es/siesta/units"
    xmlns="http://www.xml-cml.org/schema"
>

  <unit id="ry" 
    title="Ry"
    multiplierToSI="1.0973731568525E+07" 
    symbol="Ry" 
    unitType="unitType:length-1">
      <metadata name="dc:source" content="Wikipedia"/>
    <definition>the "infinity" Rydberg constant</definition>
    <description>
<h:p>The Rydberg constant is named after physicist Janne Rydberg, and 
is a physical constant discovered when measuring the spectrum of hydrogen, 
and building upon results from Anders Jonas Angstrom and Johann Balmer. 
Each chemical element has its own Rydberg constant, which can be 
derived from the "infinity" Rydberg constant.</h:p>
<h:p>The "infinity" Rydberg constant is (according to 2002 CODATA results):</h:p>
<h:p>This constant is often used in atomic physics in the form of an energy (see RyEnergy)</h:p>
    </description>
  </unit>
  
  <unit id="ryenergy" 
    title="Rydberg energy"
    multiplierToSI="-99" 
    symbol="Ry" 
    unitType="unitType:energy">
      <metadata name="dc:source" content="Wikipedia"/>
      <definition>energy equivalent of 1 Rydberg</definition>
    <description>
    <h:p>h * c * Ryinf = 13.6056923 eV</h:p>
<h:p>This constant is often used in atomic physics in the form of an energy</h:p>
    </description>
  </unit>

 
  <unit 
   id="bohr" 
   title="Bohr"
    multiplierToSI="-99" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
  
  <unit 
    id="ry.bohr" 
    title="Ry Bohr"
    multiplierToSI="-99" 
    symbol="Ry Bohr" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
  
  <unit 
  id="ry.bohr3" 
  title="Ry Bohr cubed" 
  parentSI="si:unknown"
    multiplierToSI="-99" 
    symbol="Ry.Bohr3" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
 
  <unit id="kbar" 
    title="kilobar" 
    parentSI="si:pa"
    multiplierToSI="-99" 
    symbol="kbar" 
    unitType="unitType:pressure">
    <description>pressure???
    </description>
  </unit>
  
  <unit 
  id="exx" 
  title="e__" 
  parentSI="si:unknown"
    multiplierToSI="-99" 
    symbol="e__" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
  
  <unit id="ev.ang-3"
  title="electron volts per angstrom cubed" 
  parentSI="si:unknown"
    multiplierToSI="-99" 
    symbol="eV.A-3" 
    unitType="unitType:unknown">
    <definition>...</definition>
    <description>...</description>
  </unit>
  
</unitList>
>>>>>>> .merge-right.r915
