Merge remote-tracking branch 'origin/master'

.gitignore

@@ -23,6 +23,7 @@ parts/
 sdist/
 var/
 .idea/
+ptable-parser/
 *.egg-info/
 .installed.cfg
 *.egg

MolarMass.py

@@ -1,19 +1,7 @@
 __author__ = 'Deon Hua and Timothy Mui'
 
-elementDict = {"H":1.0079,"He":4.0026,"Li":6.941,"Be":9.0122,"B":10.811,"C":12.0107,"N":14.0067,"O":15.9994,\
-               "F":18.9984,"Ne":20.1797,"Na":22.9897,"Mg":24.305,"Al":26.9815,"Si":28.0855,"P":30.9738,"S":32.065,\
-               "Cl":35.453,"Ar":39.948,"K":39.0983,"Ca":40.078,"Sc":44.9559,"Ti":47.867,"V":50.9415,"Cr":51.9961,\
-               "Mn":54.938,"Fe":55.845,"Co":58.9332,"Ni":58.6934,"Cu":63.546,"Zn":65.39,"Ga":69.723,"Ge":72.64,\
-               "As":74.9216,"Se":78.96,"Br":79.904,"Kr":83.8,"Rb":85.4678,"Sr":87.62,"Y":88.9059,"Zr":91.224,\
-               "Nb":92.9064,"Mo":95.94,"Tc":98,"Ru":101.07,"Rh":102.9055,"Pd":106.42,"Ag":107.8682,"Cd":112.411,\
-               "In":114.818,"Sn":118.71,"Sb":121.76,"Te":127.6,"I":126.9045,"Xe":131.293,"Cs":132.9055,"Ba":137.327,\
-               "La":138.9055,"Ce":140.116,"Pr":140.9077,"Nd":144.24,"Pm":145,"Sm":150.36,"Eu":151.964,"Gd":157.25,\
-               "Tb":158.9253,"Dy":162.5,"Ho":164.9303,"Er":167.259,"Tm":168.9342,"Yb":173.04,"Lu":174.967,"Hf":178.49,\
-               "Ta":180.9479,"W":183.84,"Re":186.207,"Os":190.23,"Ir":192.217,"Pt":195.078,"Au":196.9665,"Hg":200.59,\
-               "Tl":204.3833,"Pb":207.2,"Bi":208.9804,"Po":209,"At":210,"Rn":222,"Fr":223,"Ra":226,"Ac":227,\
-               "Th":232.0381,"Pa":231.0359,"U":238.0289,"Np":237,"Pu":244,"Am":243,"Cm":247,"Bk":247,"Cf":251,\
-               "Es":252,"Fm":257,"Md":258,"No":259,"Lr":262,"Rf":261,"Db":262,"Sg":266,"Bh":264,"Hs":277,"Mt":268}
-
+#Data obtained from NIST
+elementDict = {"H": 1.00794000, "He": 4.00260200, "Li": 6.94100000, "Be": 9.01218200, "B": 10.81100000, "C": 12.01070000, "N": 14.00670000, "O": 15.99940000, "F": 18.99840320, "Ne": 20.17970000, "Na": 22.98976928, "Mg": 24.30500000, "Al": 26.98153860, "Si": 28.08550000, "P": 30.97376200, "S": 32.06500000, "Cl": 35.45300000, "Ar": 39.94800000, "K": 39.09830000, "Ca": 40.07800000, "Sc": 44.95591200, "Ti": 47.86700000, "V": 50.94150000, "Cr": 51.99610000, "Mn": 54.93804500, "Fe": 55.84500000, "Co": 58.93319500, "Ni": 58.69340000, "Cu": 63.54600000, "Zn": 65.38000000, "Ga": 69.72300000, "Ge": 72.64000000, "As": 74.92160000, "Se": 78.96000000, "Br": 79.90400000, "Kr": 83.79800000, "Rb": 85.46780000, "Sr": 87.62000000, "Y": 88.90585000, "Zr": 91.22400000, "Nb": 92.90638000, "Mo": 95.96000000, "Tc": 98.00000000, "Ru": 101.07000000, "Rh": 102.90550000, "Pd": 106.42000000, "Ag": 107.86820000, "Cd": 112.41100000, "In": 114.81800000, "Sn": 118.71000000, "Sb": 121.76000000, "Te": 127.60000000, "I": 126.90447000, "Xe": 131.29300000, "Cs": 132.90545190, "Ba": 137.32700000, "La": 138.90547000, "Ce": 140.11600000, "Pr": 140.90765000, "Nd": 144.24200000, "Pm": 145.00000000, "Sm": 150.36000000, "Eu": 151.96400000, "Gd": 157.25000000, "Tb": 158.92535000, "Dy": 162.50000000, "Ho": 164.93032000, "Er": 167.25900000, "Tm": 168.93421000, "Yb": 173.05400000, "Lu": 174.96680000, "Hf": 178.49000000, "Ta": 180.94788000, "W": 183.84000000, "Re": 186.20700000, "Os": 190.23000000, "Ir": 192.21700000, "Pt": 195.08400000, "Au": 196.96656900, "Hg": 200.59000000, "Tl": 204.38330000, "Pb": 207.20000000, "Bi": 208.98040000, "Po": 209.00000000, "At": 210.00000000, "Rn": 222.00000000, "Fr": 223.00000000, "Ra": 226.00000000, "Ac": 227.00000000, "Th": 232.03806000, "Pa": 231.03588000, "U": 238.02891000, "Np": 237.00000000, "Pu": 244.00000000, "Am": 243.00000000, "Cm": 247.00000000, "Bk": 247.00000000, "Cf": 251.00000000, "Es": 252.00000000, "Fm": 257.00000000, "Md": 258.00000000, "No": 259.00000000, "Lr": 262.00000000, "Rf": 265.00000000, "Db": 268.00000000, "Sg": 271.00000000, "Bh": 272.00000000, "Hs": 270.00000000, "Mt": 276.00000000, "Ds": 281.00000000, "Rg": 280.00000000, "Cn": 285.00000000}
 
 def get_molar_mass(raw_formula):
     if check_formula(raw_formula):

app.py

@@ -17,6 +17,10 @@ def conversion():
 def about():
     return render_template("about.html")
 
+@app.route("/google0dec4c879860ede1.html")
+def verify():
+    return render_template("google0dec4c879860ede1.html")
+
 @app.route("/postChemFormula", methods = ["POST"])
 def postChemFormula():
     post = request.get_json()

templates/about.html

@@ -62,8 +62,9 @@ <h1>About MolarFast</h1>
 				<p>As of the latest update, MolarFast is mostly functional - you can use brackets, coefficents, etc. However, hydrates DO NOT fully work.
 				Issues can be reported on the <a href = "https://github.com/DeonHua/MolarFast/issues">Github</a>.</p>
                 <p>Most information on constants and other values were obtained from data sheets provided by the
-                University of Waterloo Department of Chemical Engineering. The University of Waterloo Department of Chemical Engineering is not
-                associated or affiliated with MolarFast.</p>
+                University of Waterloo Department of Chemical Engineering. Standard atomic weight is used for all molar mass calculations. Standard atomic weight values
+                were obtained from <a href="http://physics.nist.gov/cgi-bin/Compositions/stand_alone.pl">National Institute of Standards and Technology (NIST)</a>.
+                The University of Waterloo, University of Waterloo Department of Chemical Engineering, nor NIST is associated or affiliated with MolarFast.</p>
 				<p>Internet is required to use MolarFast.</p>
 
 

templates/index.html

@@ -105,12 +105,12 @@ <h4 class="panel-title">Constants</h4>
                     </div>
 
 				  <div class="panel panel-default">
-                      <a class="collapsed" data-toggle="collapse"  href="#collapseOne" aria-expanded="false" aria-controls="collapseOne" id = "aTitle">
-					    <div class="panel-heading" role="tab" id="headingOne">
+                      <a class="collapsed" data-toggle="collapse"  href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo" id = "aTitle">
+					    <div class="panel-heading" role="tab" id="headingTwo">
 					        <h4 class="panel-title">Gas Constants (R)</h4>
 					    </div>
                       </a>
-					<div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+					<div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
 					  <div class="panel-body">
                         <table class="table table-striped">
                           <tr>
@@ -135,12 +135,12 @@ <h4 class="panel-title">Gas Constants (R)</h4>
 				  </div>
 
 				  <div class="panel panel-default">
-                    <a class="collapsed" data-toggle="collapse"  href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo" id = "aTitle">
-					    <div class="panel-heading" role="tab" id="headingTwo">
+                    <a class="collapsed" data-toggle="collapse"  href="#collapseThree" aria-expanded="false" aria-controls="collapseThree" id = "aTitle">
+					    <div class="panel-heading" role="tab" id="headingThree">
 					        <h4 class="panel-title">Standard Temperatures and Pressures</h4>
 					    </div>
                     </a>
-					<div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
+					<div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
 					  <div class="panel-body">
 						<table class="table table-striped">
                           <tr>