Spaces:

dmsaylor
/

CHRIS

Running

App Files Files Community

dmsaylor commited on Dec 14, 2022

Commit

cc02f6d

1 Parent(s): e72681d

added normalized concentration

Browse files

Files changed (2) hide show

efficiency_module/efficiency.py +44 -38
efficiency_module/templates/efficiency_index.html +74 -33

efficiency_module/efficiency.py CHANGED Viewed

@@ -1,48 +1,54 @@
 import numpy as np
 from flask import render_template, request, session
 from . import blueprint
 from functions import PlaneSheetAnalytical
 # load the index page for the exposure module
-@blueprint.route('/efficiency', methods=['GET', 'POST'])
 def efficiency():
-    if request.method == "GET":
-        return render_template('efficiency_index.html')
-    else:
-        return 0
-# build the report page for the exposure module
-# @blueprint.route('/efficiency', methods=['POST'])
-# def eff_post():
-#
-#     mass = float(request.form["mass"])
-#     density = float(request.form["density"])
-#     PolymerVolume = mass / density
-#     SurfaceArea = float(request.form["area"])
-#
-#     SolventVolume = float(request.form["svol"])
-#     ExtractionTime = float(request.form["time"])*3600.
-#     iterations = int(request.form["iterations"])
-#
-#     ExtractionTime = ExtractionTime * iterations
-#     SolventVolume = SolventVolume * iterations
-#
-#     #D = float(request.form["DiffCoeff"])
-#     #K = float(request.form["PartCoeff"])
-#
-#     L = PolymerVolume / SurfaceArea
-#
-#     nterms = 5
-#     M0 = 1.
-#     K = np.array((1e-3, 1., 1e3))
-#     D = np.array((1e-7, 1e-10, 1e-13))
-#     ExtEff = np.zeros((3,3))
-#     for i in range(3):
-#         for j in range(3):
-#             ExtEff[i,j] = PlaneSheetAnalytical(M0, D[i], K[j], PolymerVolume, SurfaceArea, SolventVolume, ExtractionTime, nterms)
-#
-#     Conc = ExtEff * PolymerVolume / SolventVolume
-#
-#     return render_template('efficiency_report.html', ExtEff = ExtEff, Conc=Conc)

 import numpy as np
 from flask import render_template, request, session
 from . import blueprint
+from numpy import *
 from functions import PlaneSheetAnalytical
 # load the index page for the exposure module
+@blueprint.route('/efficiency', methods=['GET','POST'])
 def efficiency():
+    sysnum = 2
+    mass = ones((sysnum))*1.0
+    density = ones((sysnum))*1.0
+    area = ones((sysnum)) * 6.0
+    svol = ones((sysnum)) * 1.0
+    iterations = ones((sysnum)).astype('int')
+    time = ones((sysnum)) * 24.0
+    D = ones((sysnum)) * 1e-08
+    K = ones((sysnum)) * 1.0
+    release = zeros((sysnum))
+    conc = zeros((sysnum))
+    if request.method == 'POST':
+        sysnum = int(request.form["sysnum"])
+        mass = ones((sysnum))
+        density = ones((sysnum))
+        area = ones((sysnum))
+        svol = ones((sysnum))
+        iterations = ones((sysnum)).astype('int')
+        time = ones((sysnum))
+        D = ones((sysnum))
+        K = ones((sysnum))
+        release = ones((sysnum))
+        conc = ones((sysnum))
+        for i in range(sysnum):
+            mass[i] = float(request.form["mass"+str(i)])
+            density[i] = float(request.form["density" + str(i)])
+            area[i] = float(request.form["area" + str(i)])
+            svol[i] = float(request.form["svol" + str(i)])
+            iterations[i] = int(request.form["iterations" + str(i)])
+            time[i] = float(request.form["time" + str(i)])
+            D[i] = float(request.form["D" + str(i)])
+            K[i] = float(request.form["K" + str(i)])
+            PolymerVolume = mass[i] / density[i]
+            ExtractionTime = time[i] * 3600. * iterations[i]
+            SolventVolume = svol[i] * iterations[i]
+            nterms = 5
+            M0 = 1.
+            release[i] = PlaneSheetAnalytical(M0, D[i], K[i], PolymerVolume, area[i], SolventVolume, ExtractionTime, nterms)
+            conc[i] = release[i] * PolymerVolume / SolventVolume
+    return render_template('efficiency_index.html', sysnum=sysnum, mass=mass, density=density, area=area, svol=svol, iterations=iterations,
+                           time=time, D=D, K=K, release=release, conc=conc)

efficiency_module/templates/efficiency_index.html CHANGED Viewed

@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>CHRIS</title>
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
   <link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles.css') }}">
@@ -29,88 +29,129 @@ table, th, td {
 <script>
       function addColumn(){
-        var i = document.getElementById('theTable').rows[0].cells.length;
-        $("#theTable tr:eq( 0 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required id='mass'" + i + "> </td>");
-        $("#theTable tr:eq( 1 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required id='density'" + i + "> </td>");
-        $("#theTable tr:eq( 2 )").append("<td> <input type='number' step='any' value='6.0' min='0.00001' required id='area'" + i + "> </td>");
-        $("#theTable tr:eq( 3 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required id='svol'" + i + "> </td>");
-        $("#theTable tr:eq( 4 )").append("<td> <input type='number' step='1' value='1' min='1' onchange='this.value = parseInt(this.value);' required id='iterations'" + i + "> </td>");
-        $("#theTable tr:eq( 5 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required id='time'" + i + "> </td>");
-        $("#theTable tr:eq( 6 )").append("<td> <input type='number' step='any' value='1e-8' min='1e-20' required id='D'" + i + "> </td>");
-        $("#theTable tr:eq( 7 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required id='K'" + i + "> </td>");
         $("#theTable tr:eq( 8 )").append("<td> <input readonly id='release'" + i + "> </td>");
       };
       function removeColumn(){
-        var i = document.getElementById('theTable').rows[0].cells.length;
-        if (i == 2){
           alert("At least one entry is required");
         } else {
           $('#theTable tr').find('td:last').remove();
         }
-      };
 </script>
 <body>
-<form method="POST">
   <input type = "button" onclick = "javascript:addColumn()" value = "Add column" />
   <input type = "button" onclick = "javascript:removeColumn()" value = "Remove column" />
-  <table id="theTable">
   <tr>
     <th> Test article mass (g)</th>
-    <td> <input name="mass1" id="mass1" step="any" value="1.0" min="0.000001" type="number" required> </td>
-    <td> <input name="mass2" id="mass2" step="any" value="1.0" min="0.000001" type="number" required> </td>
   </tr>
   <tr>
     <th> Test article density (g/cm<sup>3</sup>) </th>
-    <td> <input name="density1" id="density1" step="any" value="1.0" min="0.01" type="number" required> </td>
-    <td> <input name="density2" id="density2" step="any" value="1.0" min="0.01" type="number" required> </td>
   </tr>
   <tr>
     <th> Test article surface area (cm<sup>2</sup>) </th>
-    <td> <input name="area1" id="area1" step="any" value="6.0" min="0.001" type="number" required> </td>
-    <td> <input name="area2" id="area2" step="any" value="6.0" min="0.001" type="number" required> </td>
   </tr>
   <tr>
     <th> Solvent volume (ml) </th>
-    <td> <input name="svol1" id="svol1" step="any" value="1.0" min="0.000001" type="number" required> </td>
-    <td> <input name="svol2" id="svol2" step="any" value="1.0" min="0.000001" type="number" required> </td>
   </tr>
   <tr>
     <th> # of iterations </th>
-    <td> <input name="iterations1" id="iterations1" value="1" min="1" type="number" step="1" onchange="this.value = parseInt(this.value);" required> </td>
-    <td> <input name="iterations2" id="iterations2" value="1" min="1" type="number" step="1" onchange="this.value = parseInt(this.value);" required> </td>
   </tr>
   <tr>
     <th> time per iteration (h) </th>
-    <td> <input name="time1" id="time1" step="any" value="24.0" min="0.001" type="number" required> </td>
-    <td> <input name="time2" id="time2" step="any" value="24.0" min="0.001" type="number" required> </td>
   </tr>
   <tr>
     <th> Diffusion coefficient (cm<sup>2</sup>/s) </th>
-    <td> <input name="D1" id="D1" step="any" value="1e-8" min="1e-20" type="number" required> </td>
-    <td> <input name="D2" id="D2" step="any" value="1e-8" min="1e-20" type="number" required> </td>
   </tr>
   <tr>
     <th> Partition coefficient </th>
-    <td> <input name="K1" id="K1" step="any" value="1" min="1e-3" type="number" required> </td>
-    <td> <input name="K2" id="K2" step="any" value="1" min="1e-3" type="number" required> </td>
   </tr>
   <tr>
     <th> M/M0 </th>
-    <td> <input name="release1" id="release1" readonly> </td>
-    <td> <input name="release2" id="release2" readonly> </td>
   </tr>
   </table>
   <br> <button type="submit">Calculate</button>
 </body>
 </html>

 <head>
   <meta charset="UTF-8">
   <title>CHRIS</title>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js" ></script>
   <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
   <link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles.css') }}">
 <script>
       function addColumn(){
+        var i = document.getElementById('theTable').rows[0].cells.length-1;
+        $("#theTable tr:eq( 0 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required name='mass" + i + "'> </td>");
+        $("#theTable tr:eq( 1 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required name='density" + i + "'> </td>");
+        $("#theTable tr:eq( 2 )").append("<td> <input type='number' step='any' value='6.0' min='0.00001' required name='area" + i + "'> </td>");
+        $("#theTable tr:eq( 3 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required name='svol" + i + "'> </td>");
+        $("#theTable tr:eq( 4 )").append("<td> <input type='number' step='1' value='1' min='1' onchange='this.value = parseInt(this.value);' required name='iterations" + i + "'> </td>");
+        $("#theTable tr:eq( 5 )").append("<td> <input type='number' step='any' value='24.0' min='0.00001' required name='time" + i + "'> </td>");
+        $("#theTable tr:eq( 6 )").append("<td> <input type='number' step='any' value='1e-08' min='1e-20' required name='D" + i + "'> </td>");
+        $("#theTable tr:eq( 7 )").append("<td> <input type='number' step='any' value='1.0' min='0.00001' required name='K" + i + "'> </td>");
         $("#theTable tr:eq( 8 )").append("<td> <input readonly id='release'" + i + "> </td>");
+        $("#theTable tr:eq( 9 )").append("<td> <input readonly id='conc'" + i + "> </td>");
+        //alert(i)
+        document.getElementById("sysnum").value = i+1
       };
       function removeColumn(){
+        var i = document.getElementById('theTable').rows[0].cells.length-1;
+        if (i == 1){
           alert("At least one entry is required");
         } else {
           $('#theTable tr').find('td:last').remove();
+          document.getElementById("sysnum").value = i-1
         }
+      }
 </script>
 <body>
+<form method="POST" id="theForm" align="center">
   <input type = "button" onclick = "javascript:addColumn()" value = "Add column" />
   <input type = "button" onclick = "javascript:removeColumn()" value = "Remove column" />
+  <table id="theTable" align="center">
   <tr>
     <th> Test article mass (g)</th>
+    {% for i in range(sysnum) %}
+    <td> <input name="mass{{i}}" id="mass{{i}}" step="any" value="{{mass[i]}}" min="0.000001" type="number" required> </td>
+    {% endfor %}
   </tr>
   <tr>
     <th> Test article density (g/cm<sup>3</sup>) </th>
+    {% for i in range(sysnum) %}
+    <td> <input name="density{{i}}" id="density{{i}}" step="any" value="{{density[i]}}" min="0.01" type="number" required> </td>
+    {% endfor %}
   </tr>
   <tr>
     <th> Test article surface area (cm<sup>2</sup>) </th>
+    {% for i in range(sysnum) %}
+    <td> <input name="area{{i}}" id="area{{i}}" step="any" value="{{area[i]}}" min="0.001" type="number" required> </td>
+    {% endfor %}
   </tr>
   <tr>
     <th> Solvent volume (ml) </th>
+    {% for i in range(sysnum) %}
+    <td> <input name="svol{{i}}" id="svol{{i}}" step="any" value="{{svol[i]}}" min="0.000001" type="number" required> </td>
+    {% endfor %}
   </tr>
   <tr>
     <th> # of iterations </th>
+    {% for i in range(sysnum) %}
+    <td> <input name="iterations{{i}}" id="iterations{{i}}" value="{{iterations[i]}}" min="1" type="number" step="1" onchange="this.value = parseInt(this.value);" required> </td>
+    {% endfor %}
   </tr>
   <tr>
     <th> time per iteration (h) </th>
+    {% for i in range(sysnum) %}
+    <td> <input name="time{{i}}" id="time{{i}}" step="any" value="{{time[i]}}" min="0.001" type="number" required> </td>
+    {% endfor %}
   </tr>
   <tr>
     <th> Diffusion coefficient (cm<sup>2</sup>/s) </th>
+    {% for i in range(sysnum) %}
+    <td> <input name="D{{i}}" id="D{{i}}" step="any" value="{{D[i]}}" min="1e-20" type="number" required> </td>
+    {% endfor %}
   </tr>
   <tr>
     <th> Partition coefficient </th>
+    {% for i in range(sysnum) %}
+    <td> <input name="K{{i}}" id="K{{i}}" step="any" value="{{K[i]}}" min="1e-6" type="number" required> </td>
+    {% endfor %}
   </tr>
   <tr>
     <th> M/M0 </th>
+    {% if release[0] == 0 %}
+    {% for i in range(sysnum) %}
+    <td> <input name="release{{i}}" id="release{{i}}" readonly> </td>
+    {% endfor %}
+    {% else %}
+    {% for i in range(sysnum) %}
+    <td> <input name="release{{i}}" id="release{{i}}" value="{{'%0.4f'%release[i]|float}}" readonly> </td>
+    {% endfor %}
+    {% endif %}
+  </tr>
+  <tr>
+    <th> C/C0 </th>
+    {% if conc[0] == 0 %}
+    {% for i in range(sysnum) %}
+    <td> <input name="conc{{i}}" id="conc{{i}}" readonly> </td>
+    {% endfor %}
+    {% else %}
+    {% for i in range(sysnum) %}
+    <td> <input name="conc{{i}}" id="conc{{i}}" value="{{'%0.4f'%conc[i]|float}}" readonly> </td>
+    {% endfor %}
+    {% endif %}
   </tr>
   </table>
   <br> <button type="submit">Calculate</button>
+  <input name="sysnum" id="sysnum" step="any" value={{sysnum}}  type="number" required style="display: none;">
+</form>
 </body>
 </html>