removed space between parameter inputs

BattMoTeam · Jun 11, 2024 · e8db4e9 · e8db4e9
1 parent 87e8283
commit e8db4e9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/streamlit/app_scripts/app_view.py b/streamlit/app_scripts/app_view.py
@@ -1170,7 +1170,6 @@ def fill_category_protocol(self, category_id,category_display_name, category_nam
 
                 if parameter.options.get(selected_parameter_id):
 
-                    st_space(tab)
                     name_col, input_col = tab.columns([1, 2])
 
                     if isinstance(parameter, NumericalParameter):
@@ -2124,7 +2123,7 @@ def fill_advanced_expander(self, tab,category_name, category_display_name,catego
                                 template_parameter_id=parameter.id,
                                 parameter_set_id=non_material_parameter_set_id
                             )
-                            st_space(tab_advanced)
+                            #st_space(tab_advanced)
                             name_col, input_col = tab_advanced.columns(2)
 
                             if isinstance(parameter, NumericalParameter):

diff --git a/streamlit/input_files/battmo_formatted_input.json b/streamlit/input_files/battmo_formatted_input.json
@@ -67,18 +67,18 @@
       "Coating": {
          "thickness": 7.599999999999999e-05,
          "N": 20,
-         "effectiveDensity": 728.212,
+         "effectiveDensity": 3151.12,
          "bruggemanCoefficient": 1.5,
          "ActiveMaterial": {
             "massFraction": 0.9,
-            "density": 991.0,
+            "density": 4950.0,
             "electronicConductivity": 100.0,
             "specificHeatCapacity": 700.0,
             "thermalConductivity": 2.1,
             "Interface": {
                "saturationConcentration": 21200.0,
                "volumetricSurfaceArea": 4418460.0,
-               "density": 991.0,
+               "density": 4950.0,
                "numberOfElectronsTransferred": 1,
                "activationEnergyOfReaction": 35000.0,
                "reactionRateConstant": 9.736e-07,
@@ -170,7 +170,7 @@
    "Control": {
       "controlPolicy": "CCCV",
       "initialControl": "charging",
-      "numberOfCycles": 1,
+      "numberOfCycles": 3,
       "CRate": 1.0,
       "DRate": 1.3,
       "lowerCutoffVoltage": 2.4,

diff --git a/streamlit/input_files/linked_data_input.json b/streamlit/input_files/linked_data_input.json
@@ -4165,7 +4165,7 @@
                         "@type": "emmo:Density",
                         "value": {
                            "@type": "emmo:Numerical",
-                           "hasNumericalData": 991.0
+                           "hasNumericalData": 4950.0
                         },
                         "unit": {
                            "label": "GramPerCubicMetre",
@@ -4256,7 +4256,7 @@
                         "@type": "emmo:SpecificCapacity",
                         "value": {
                            "@type": "emmo:Numerical",
-                           "hasNumericalData": 494.7247163027245
+                           "hasNumericalData": 99.04488764767676
                         },
                         "unit": {
                            "label": "MiliAmpereHourPerGram",
@@ -4599,7 +4599,7 @@
                         "@type": "emmo:MassLoading",
                         "value": {
                            "@type": "emmo:Numerical",
-                           "hasNumericalData": 5.534411199999999
+                           "hasNumericalData": 23.948511999999994
                         },
                         "unit": {
                            "label": "MiliGramPerCubicCentiMeter",
@@ -4651,7 +4651,7 @@
                         "@type": "emmo:Capacity",
                         "value": {
                            "@type": "emmo:Numerical",
-                           "hasNumericalData": 665.336432629897
+                           "hasNumericalData": 576.3905763296764
                         },
                         "unit": {
                            "label": "MiliAmpereHour",
@@ -6081,7 +6081,7 @@
                   "@type": "emmo:N/PRatio",
                   "value": {
                      "@type": "emmo:Numerical",
-                     "hasNumericalData": 1.68
+                     "hasNumericalData": 1.94
                   },
                   "unit": {
                      "label": "UnitOne",
@@ -6094,7 +6094,7 @@
                   "@type": "emmo:CellMass",
                   "value": {
                      "@type": "emmo:Numerical",
-                     "hasNumericalData": 28.39886829632
+                     "hasNumericalData": 31.7796972032
                   },
                   "unit": {
                      "label": "Gram",
@@ -6107,7 +6107,7 @@
                   "@type": null,
                   "value": {
                      "@type": "emmo:Numerical",
-                     "hasNumericalData": 665.336432629897
+                     "hasNumericalData": 576.3905763296764
                   },
                   "unit": {
                      "label": "AmpereHour",
@@ -6205,7 +6205,7 @@
                   "@type": "emmo:NumberOfEntities",
                   "value": {
                      "@type": "emmo:Numerical",
-                     "hasNumericalData": 1
+                     "hasNumericalData": 3
                   },
                   "unit": {
                      "label": "UnitOne",

diff --git a/streamlit/output_files/battmo_results.hdf5 b/streamlit/output_files/battmo_results.hdf5
diff --git a/streamlit/output_files/calculated_values.json b/streamlit/output_files/calculated_values.json
@@ -2,11 +2,11 @@
    "calculatedParameters": {
       "effective_density": {
          "negative_electrode": 1770.4,
-         "positive_electrode": 728.212
+         "positive_electrode": 3151.12
       },
       "mass_loadings": {
          "negative_electrode": 15.0484,
-         "positive_electrode": 5.534411199999999
+         "positive_electrode": 23.948511999999994
       }
    }
 }
diff --git a/streamlit/output_files/indicator_values.json b/streamlit/output_files/indicator_values.json
@@ -1,18 +1,18 @@
 {
    "Cell": {
       "cellMass": {
-         "value": 28.39886829632,
+         "value": 31.7796972032,
          "unit": "g"
       },
       "roundTripEfficiency": {
          "unit": "1"
       },
       "nominalCellCapacity": {
-         "value": 665.336432629897,
+         "value": 576.3905763296764,
          "unit": "mAh"
       },
       "NPRatio": {
-         "value": 1.68,
+         "value": 1.94,
          "unit": "1"
       }
    },
@@ -42,7 +42,7 @@
    },
    "PositiveElectrode": {
       "massLoading": {
-         "value": 5.534411199999999,
+         "value": 23.948511999999994,
          "unit": "mg\u00b7cm\u207b\u00b2"
       },
       "thickness": {
@@ -54,12 +54,12 @@
          "unit": "1"
       },
       "specificCapacity": {
-         "value": 665.336432629897,
+         "value": 576.3905763296764,
          "unit": "mAh"
       },
       "ActiveMaterial": {
          "specificCapacity": {
-            "value": 494.7247163027245,
+            "value": 99.04488764767676,
             "unit": "mAh\u00b7g\u207b\u00b9"
          }
       }