From a7fdbe62639e19bca268cf8181706b54e00977d3 Mon Sep 17 00:00:00 2001
From: Moises Sacal <moisbo@gmail.com>
Date: Tue, 21 Nov 2023 11:31:30 +1100
Subject: [PATCH] fixed help, parameters, rotation and some styles

---
 package.json                          |   2 +-
 public/parameters.json                |  51 ++++
 public/sample-data-20-year.json       | 106 +-------
 src/components/About.vue              |  73 +++---
 src/components/Contact.vue            |  44 ++--
 src/components/Help.vue               | 360 +++++++++++++-------------
 src/components/Input.vue              | 112 +++++---
 src/components/layouts/BaseHeader.vue |   8 +-
 src/defaults.js                       |  54 +---
 src/model.service.js                  |  20 +-
 src/store.js                          |  10 +-
 11 files changed, 396 insertions(+), 444 deletions(-)
 create mode 100644 public/parameters.json

diff --git a/package.json b/package.json
index 1189d04..f581b94 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "socrates-web",
   "private": true,
-  "version": "0.0.28",
+  "version": "0.0.29",
   "type": "module",
   "homepage": "https://soil-and-land.github.io/socrates-web/",
   "scripts": {
diff --git a/public/parameters.json b/public/parameters.json
new file mode 100644
index 0000000..265c265
--- /dev/null
+++ b/public/parameters.json
@@ -0,0 +1,51 @@
+{
+  "cn_rate_1": 0.84,
+  "cn_rate_2": 0.07,
+  "cn_rate_3": 0.055,
+  "cn_rate_4": 0.0009,
+  "cn_rate_5": 0.95,
+  "labile": 2,
+  "stable": 98,
+  "pasture_mf": 0.16,
+  "fallow_mf": 0.9,
+  "crop_mf": 0.26,
+  "bd": 1.3,
+  "dlayr": 10,
+  "depth30_10": 2.33,
+  "cn": 60,
+  "porghum": 0.03,
+  "grz": 0.6,
+  "root_grz": 0.55,
+  "root_p": 0.5,
+  "root_gl": 0.4,
+  "root_wgt": 0.4,
+  "hi_0": 0.42,
+  "hi_1": 0.42,
+  "hi_2": 0.42,
+  "hi_3": 0.42,
+  "hi_4": 0.35,
+  "hi_5": 1,
+  "hi_6": 1,
+  "hi_7": 1,
+  "stored_hfc": 3,
+  "temp_amplitude": 30,
+  "rain_amplitude": 30,
+  "temp_rand": 20,
+  "precip_rand": 30,
+  "annpar": 75,
+  "heavy_retained": 40,
+  "light_retained": 70,
+  "base_retained": 88,
+  "nurate": 0.2,
+  "tam": 48.5,
+  "ef1": 0.01,
+  "ef2": 0.0035,
+  "n2o_n": 1.57,
+  "gwpn2o": 296,
+  "co2_c": 3.67,
+  "fracf": 0.1,
+  "fracu": 0.2,
+  "fracl": 0.3,
+  "ch4_sheep": 8,
+  "gwp_ch4": 34
+}
diff --git a/public/sample-data-20-year.json b/public/sample-data-20-year.json
index 8d81334..bd6c2e1 100644
--- a/public/sample-data-20-year.json
+++ b/public/sample-data-20-year.json
@@ -2,7 +2,7 @@
   "soil": {
     "soil_properties": 7,
     "cec": 80,
-    "initial_oc": 1.2
+    "initial_oc": 1.15
   },
   "simulation": {
     "start_year": 1963,
@@ -45,7 +45,7 @@
       "year": 2,
       "plant": 0,
       "stubble": 0,
-      "graze": null,
+      "graze": 0,
       "fertiliser": 200
     },
     {
@@ -57,108 +57,8 @@
     }
   ],
   "yields": {
-    "yields_method_data_entry": 0,
+    "yields_method_data_entry": 1,
     "annual_yields": [
-      {
-        "year": 1963,
-        "rotation": "Fallow",
-        "yield": 0
-      },
-      {
-        "year": 1964,
-        "rotation": "Wheat",
-        "yield": 3311
-      },
-      {
-        "year": 1965,
-        "rotation": "Legume Pasture",
-        "yield": 3638
-      },
-      {
-        "year": 1966,
-        "rotation": "Fallow",
-        "yield": 0
-      },
-      {
-        "year": 1967,
-        "rotation": "Wheat",
-        "yield": 1195
-      },
-      {
-        "year": 1968,
-        "rotation": "Legume Pasture",
-        "yield": 7357
-      },
-      {
-        "year": 1969,
-        "rotation": "Fallow",
-        "yield": 0
-      },
-      {
-        "year": 1970,
-        "rotation": "Wheat",
-        "yield": 2724
-      },
-      {
-        "year": 1971,
-        "rotation": "Legume Pasture",
-        "yield": 3034
-      },
-      {
-        "year": 1972,
-        "rotation": "Fallow",
-        "yield": 0
-      },
-      {
-        "year": 1973,
-        "rotation": "Wheat",
-        "yield": 1682
-      },
-      {
-        "year": 1974,
-        "rotation": "Legume Pasture",
-        "yield": 5208
-      },
-      {
-        "year": 1975,
-        "rotation": "Fallow",
-        "yield": 0
-      },
-      {
-        "year": 1976,
-        "rotation": "Wheat",
-        "yield": 2912
-      },
-      {
-        "year": 1977,
-        "rotation": "Legume Pasture",
-        "yield": 2034
-      },
-      {
-        "year": 1978,
-        "rotation": "Fallow",
-        "yield": 0
-      },
-      {
-        "year": 1979,
-        "rotation": "Wheat",
-        "yield": 2238
-      },
-      {
-        "year": 1980,
-        "rotation": "Legume Pasture",
-        "yield": 1273
-      },
-      {
-        "year": 1981,
-        "rotation": "Fallow",
-        "yield": 0
-      },
-      {
-        "year": 1982,
-        "rotation": "Wheat",
-        "yield": 1768
-      }
     ]
   }
 }
diff --git a/src/components/About.vue b/src/components/About.vue
index c90c48e..25dacc6 100644
--- a/src/components/About.vue
+++ b/src/components/About.vue
@@ -3,34 +3,49 @@
 </script>
 
 <template>
-  <el-row class="m-4 p-4">
-    <el-col :xl="20" :lg="20" :md="20" :sm="24" :xs="24">
-    <div class="col-md-1"></div>
-    <div class="col-md-9">
-      <div class="basic-form">
-        <h3 class="center text-3xl">S.O.C.R.A.T.E.S.<br/>Soil Organic Carbon Reserves And Transformations in EcoSystems</h3>
-      </div>
-    </div>
-  <div class="row">
-    <div class="col-md-1"></div>
-    <div class="col-md-9">
-      <div class="basic-form border-noshadow">
-        <h4 class="text-1xl">A simple model for predicting long-term changes in soil organic carbon in terrestrial ecosystems</h4>
-        <p>The maintenance of soil organic carbon (SOC) in terrestrial ecosystems is critical for long-term
-          productivity.</p>
-        <p>Simulation models of SOC dynamics are valuable tools in predicting the impacts of climate on carbon storage
-          and developing management strategies for the mitigation of greenhouse gas emissions, however, their utility is
-          generally reduced due to need for specific data. </p>
-        <p>The SOCRATES model is a simple process based representation of SOC dynamics in terrestrial ecosystems, which
-          requires minimal data inputs and specifically designed to examine the impact of land use and land use change
-          on soil carbon storage. It also contains a simple yield calculator.</p>
-        <p>SOCRATES was successful in predicting SOC change at eighteen long-term crop, pasture and forestry trials from
-          North America, Europe and Australasia. These trials ranged from 8 to 86 years in duration, over a wide range
-          of climates and soil types.</p>
-      </div>
-    </div>
-
+  <div class="mx-4">
+    <el-row :gutter="20" class="flex flex-col justify-center items-center">
+      <el-col :span="24" :xl="20" :lg="20" :md="24" :sm="24" :xs="24">
+        <h2 class="center" style="word-break: break-all;">&nbsp;</h2>
+      </el-col>
+      <el-col :xl="20" :lg="20" :md="20" :sm="24" :xs="24">
+        <div class="col-md-1"></div>
+        <div class="col-md-9">
+          <div class="basic-form">
+            <h3 class="center text-3xl">S.O.C.R.A.T.E.S.<br/>Soil Organic Carbon Reserves And Transformations in
+              EcoSystems</h3>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-1"></div>
+          <div class="col-md-9">
+            <div class="basic-form border-noshadow">
+              <h4 class="text-1xl">A simple model for predicting long-term changes in soil organic carbon in terrestrial
+                ecosystems</h4>
+              <p>The maintenance of soil organic carbon (SOC) in terrestrial ecosystems is critical for long-term
+                productivity.</p>
+              <p>Simulation models of SOC dynamics are valuable tools in predicting the impacts of climate on carbon
+                storage
+                and developing management strategies for the mitigation of greenhouse gas emissions, however, their
+                utility is
+                generally reduced due to need for specific data. </p>
+              <p>The SOCRATES model is a simple process based representation of SOC dynamics in terrestrial ecosystems,
+                which
+                requires minimal data inputs and specifically designed to examine the impact of land use and land use
+                change
+                on soil carbon storage. It also contains a simple yield calculator.</p>
+              <p>SOCRATES was successful in predicting SOC change at eighteen long-term non-irrigated crop, pasture and
+                forestry trials from
+                North America, Europe and Australasia. These trials ranged from 8 to 86 years in duration, over a wide
+                range
+                of climates and soil types. See <a target="_blank" rel="noreferrer noopener"
+                                                   href="http://doi.org/10.1016/j.soilbio.2005.09.013">Grace et al
+                  (2006) SOCRATES—a simple model for predicting long-term changes in soil organic carbon in terrestrial
+                  ecosystems. Soil Biology and Biochemistry, 38, 1172-1176.</a></p>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
   </div>
-    </el-col>
-  </el-row>
 </template>
diff --git a/src/components/Contact.vue b/src/components/Contact.vue
index 9eba67e..c1e8543 100644
--- a/src/components/Contact.vue
+++ b/src/components/Contact.vue
@@ -3,26 +3,32 @@
 </script>
 
 <template>
-  <el-row class="m-4 p-4">
-    <el-col :xl="20" :lg="20" :md="20" :sm="24" :xs="24">
-      <div class="col-md-1"></div>
-      <div class="col-md-10">
-        <div class="basic-form">
-          <h5 class="text-2xl"><strong>For further information on S.O.C.R.A.T.E.S. <br/><br/>
-            Please contact the project coordinator Professor Peter Grace</strong></h5>
-          <p class="text-1xl">
-            <strong>Institute for Future Environments</strong>
-            <br> Level 7, P Block <br> Queensland University of Technology
-            <br> Gardens Point Campus <br> GPO Box 2434
-            <br> BRISBANE QLD 4001
-            <br> Phone: (07) 3138 1904
-            <br> Fax: (07) 3138 4438
-            <br> Email: <a href="mailto:ife@qut.edu.au">pr.grace@qut.edu.au</a>
-          </p>
+  <div class="mx-4">
+    <el-row :gutter="20" class="flex flex-col justify-center items-center">
+      <el-col :span="24" :xl="20" :lg="20" :md="24" :sm="24" :xs="24">
+        <h2 class="center" style="word-break: break-all;">Contact</h2>
+      </el-col>
+      <el-col :xl="20" :lg="20" :md="20" :sm="24" :xs="24">
+        <div class="col-md-1"></div>
+        <div class="col-md-10">
+          <div class="basic-form">
+            <h2 class="text-2xl">For further information on S.O.C.R.A.T.E.S. <br/><br/>
+              Please contact the project coordinator Professor Peter Grace
+            </h2>
+            <p> Level 7, P Block </p>
+            <p> Queensland University of Technology</p>
+            <p> Gardens Point Campus</p>
+            <p> GPO Box 2434</p>
+            <p> BRISBANE QLD 4001</p>
+            <p> Phone: (07) 3138 1904</p>
+            <p> Fax: (07) 3138 4438</p>
+            <p> Email: <a href="mailto:ife@qut.edu.au">pr.grace@qut.edu.au</a>
+            </p>
+          </div>
         </div>
-      </div>
-    </el-col>
-  </el-row>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <style scoped>
diff --git a/src/components/Help.vue b/src/components/Help.vue
index 7dc4f8e..e74b9e5 100644
--- a/src/components/Help.vue
+++ b/src/components/Help.vue
@@ -3,194 +3,184 @@
 </script>
 
 <template>
-  <el-row class="m-4 p-4">
-    <el-col :xl="20" :lg="20" :md="20" :sm="24" :xs="24">
-      <div class="col-md-1"></div>
-      <div class="col-md-10">
-        <div class="basic-form">
-          <h3 class="center">SOCRATES Help</h3>
-          <h4><a id="Inputs" name="Inputs" href="#/help/#Inputs">INPUTS</a></h4>
-          <h3>Soil</h3>
-          <div class="border-noshadow">
-            <h4>Soil content</h4>
-            <p>Socrates needs the Cation Exchange Capacity (CEC) of the soil. If CEC is not available then estimates are
-              made from the clay % or the soil type. If you have the CEC value use this, otherwise Clay% or lastly soil
-              type.</p>
-            <h4>Clay %</h4>
-            <p>Enter the % of <strong>clay</strong> in the soil as indicated on a soil test.</p>
-            <h4>CEC</h4>
-            <p>Enter the <strong>CEC</strong> (Cation Exchange Capacity) in mmol/kg as indicated on a soil test.</p>
-            <h4>Initial OC %</h4>
-            <p>Enter the <strong>OC</strong> (Organic Carbon percentage) as indicated on a soil test. As soils can vary
-              quite widely due to past management, a starting value is important to obtain.</p>
+  <div class="mx-4">
+    <el-row :gutter="20" class="flex flex-col justify-center items-center">
+      <el-col :span="24" :xl="20" :lg="20" :md="24" :sm="24" :xs="24">
+      <h2 class="center" style="word-break: break-all;">S.O.C.R.A.T.E.S. Help</h2>
+      </el-col>
+      <el-col :span="24" :xl="20" :lg="20" :md="24" :sm="24" :xs="24">
+        <div class="col-md-1"></div>
+        <div class="col-md-10">
+          <div class="basic-form">
+            <h2>INPUTS</h2>
+            <h3>Soil</h3>
+            <div class="border-noshadow">
+              <h4>Soil content</h4>
+              <p>SOCRATES needs the Cation Exchange Capacity (CEC) of the soil. If CEC is not available then estimates
+                are
+                made from the clay % or the soil type. If you have the CEC value use this, otherwise Clay% or lastly
+                soil
+                type.</p>
+              <h4>Clay %</h4>
+              <p>Enter the % of <strong>clay</strong> in the soil as indicated on a soil test.</p>
+              <h4>CEC</h4>
+              <p>Enter the <strong>CEC</strong> (Cation Exchange Capacity) in mmol/kg as indicated on a soil test.</p>
+              <h4>Initial OC %</h4>
+              <p>Enter the <strong>OC</strong> (Organic Carbon percentage) (0-10 cm) as indicated on a soil test. As
+                soils can vary
+                quite widely due to past management, a starting value is important to obtain.</p>
+            </div>
+            <h3>Simulation</h3>
+            <div class="border-noshadow">
+              <h4>Start year (eg. 1990)</h4>
+              <p>This is needed for the graphs and when stored weather data is used (See <strong>Simulation period in
+                years</strong>).</p>
+              <h4>Simulation period in years</h4>
+              <p>This is the length of time the simulation will run. As changes are usually very slow, a period of ten
+                years is a good starting point.</p>
+              <h4>Length of rotation in years (eg. Peas - Wheat would be 2)</h4>
+              <p>The length of rotation or cropping/pasture sequence can be short (ie. 2) or very long if a
+                non-repeating
+                sequence is used. For example, if the simulation runs for tens years then a rotation can also be ten
+                years. Other examples include;</p>
+              <ul>
+                <li>Fallow - Wheat 2 years</li>
+                <li>Fallow - Wheat - Pasture 3 years</li>
+                <li>Wheat - Wheat - Pasture - Pasture 4 years</li>
+              </ul>
+            </div>
+            <h3>Climate</h3>
+            <div class="border-noshadow">
+              <h4>Method of entering data</h4>
+              <p>SOCRATES offers the user the option to enter their own weather data in various ways.</p>
+              <ul>
+                <li>Enter yearly rainfall & mean temperature (Select and click <img src="/images/edit_help.png"
+                                                                                    height="20px"/> to edit)
+                </li>
+                <li>Enter average rainfall & mean temperature (Select and click <img src="/images/edit_help.png"
+                                                                                     height="20px"/> to edit)
+                </li>
+                <li>Enter monthly rainfall & mean temperature (Select and click <img src="/images/edit_help.png"
+                                                                                     height="20px"/> to edit)
+                </li>
+              </ul>
+              <h4>Randomise annual rainfall and temperature</h4>
+              <p>This option is only available when average rainfall is selected. This allows the model to generate
+                variations in rainfall from year to year (+-30%) rather than the rainfall value being
+                the same for each year.</p>
+            </div>
+            <h3>Rotation</h3>
+            <div class="border-noshadow">
+              <p>The amount of organic carbon added or lost from the soil varies between crops, pasture and fallow. It
+                is
+                also influenced by management factors such as burning of stubbles, hay or stubble removal, grazing and
+                nitrogen application.</p>
+              <p>Information is entered for each of the rotations (There is a maximum length of <strong>20</strong>
+                different crops or phases in one rotation sequence). The number of years is determined by the entry in
+                the
+                <strong>Length of rotation in years</strong> (Simulation section) box. For example, a Fallow - Wheat -
+                Pasture rotation would have three years displayed with information required on the management of each
+                phase of the rotation.</p>
+              <p>Options: For each phase of the rotation a crop, pasture or fallow option needs to be selected.</p>
+              <table class="table table-fluid table-bordered">
+                <tr>
+                  <th>Year</th>
+                  <th>Stubble management</th>
+                  <th>Grazed</th>
+                  <th>Fertiliser N</th>
+                </tr>
+                <tr>
+                  <td>1...20</td>
+                  <td>Enter whether the stubble is removed or burnt. Removal may be as hay, stubble harvesting or
+                    burning.
+                  </td>
+                  <td>Grazing is another form of removal. The intensity of grazing determines the amount removed.</td>
+                  <td>Enter the amount of nitrogen in kg/ha that is applied to the paddock.</td>
+                </tr>
+              </table>
+            </div>
+            <h3>Yields</h3>
+            <div class="border-noshadow">
+              <h4>Method of entering yields</h4>
+              <p>SOCRATES requires dry matter production (kg/ha) for pastures and crop yield (kg/ha) for crops.</p>
+              <h4>Enter annual yields manually</h4>
+              <p>Enter seasonal grain yields (kg/ha) for crops and dry matter production (kg/ha) for pasture. You can
+                use your own
+                records or hypothetical values.
+                <br/>The yield is entered opposite the corresponding year. The total dry matter production
+                (including roots) will be estimated from these figures.
+              </p>
+              <h4>Model will calculate annual yields</h4>
+              <p>When yields are not available, SOCRATES can estimate them using a modified form of the French-Schultz
+                growing season rainfall (+ stored water) vs yield model (these can be modified by the user if site
+                specific data is available, see next paragraph). We assume that during as average season crops and
+                pastures will have available (before evaporation) approximately 70% of the growing season rainfall.</p>
+            </div>
           </div>
-          <h3>Simulation</h3>
-          <div class="border-noshadow">
-            <h4>Start year (eg. 1990)</h4>
-            <p>This is needed for the graphs and when stored weather data is used (See <strong>Simulation period in
-              years</strong>).</p>
-            <h4>Simulation period in years</h4>
-            <p>This is the length of time the simulation will run. As changes are usually very slow, a period of ten
-              years is a good starting point.</p>
-            <h4>Simulation period in years</h4>
-            <p>Must be in range - 1960 to 1990 (See <strong>Method of entering data - Closest town actual data</strong>).
-            </p>
-            <h4>Length of rotation in years (eg. Peas - Wheat would be 2)</h4>
-            <p>The length of rotation or cropping/pasture sequence can be short (ie. 2) or very long if a non-repeating
-              sequence is used. For example, if the simulation runs for tens years then a rotation can also be ten
-              years. Other examples include;</p>
-            <ul>
-              <li>Fallow - Wheat 2 years</li>
-              <li>Fallow - Wheat - Pasture 3 years</li>
-              <li>Wheat - Wheat - Pasture - Pasture 4 years</li>
-            </ul>
-          </div>
-          <h3>Climate</h3>
-          <div class="border-noshadow">
-            <h4>Method of entering data</h4>
-            <p>Socrates offers the user the option to enter their own weather data in various ways including the use
-              stored weather data from selected sites. The latter option allows different management options to be
-              tested for a period where rainfall and temperature are known. For example, we could find out what would
-              have happened if burning had continued at Walpeup during 1980 to 1990 compared to paddocks not burnt.</p>
-            <ul>
-              <li>Enter yearly rainfall & mean temperature (Select and click <img src="/images/edit_help.png"
-                                                                                  height="20px"/> to edit)
-              </li>
-              <li>Enter average rainfall & mean temperature (Select and click <img src="/images/edit_help.png"
-                                                                                   height="20px"/> to edit)
-              </li>
-              <li>Closest town, stored weather averages</li>
-              <li>Closest town, actual weather data</li>
-              <li>Enter monthly rainfall & mean temperature (Select and click <img src="/images/edit_help.png"
-                                                                                   height="20px"/> to edit)
-              </li>
-            </ul>
-            <h4>Annual mean temperature</h4>
-            <p>Enter the mean temperature for the simulation.</p>
-            <h4>Average annual rainfall</h4>
-            <p>The average Jan - Dec rainfall will be used for the period of the simulation. The <strong>Average annual
-              rainfall</strong> window opens when this option is selected.</p>
-            <h4>Closest town, average climate</h4>
-            <p>The average rainfall and temperature for the selected town will for the period of the simulation. Once
-              selected, chose the town closest to your particular station.</p>
-            <h4>Closest town, actual rainfall (1960 - 1990)</h4>
-            <p>The actual rainfall and temperature for the selected period will be used in the simulation. Once
-              selected, choose the town closest to your particular situation. This option is very good for introducing
-              variation and testing the effects of various management options.</p>
-            <h4>Randomise annual rainfall</h4>
-            <p>This option is only available when average rainfall is selected. This allows the computer generate
-              variations in rainfall from year to year (+-30%) rather than the rainfall value being
-              the same.</p>
-          </div>
-          <h3>Rotation</h3>
-          <div class="border-noshadow">
-            <p>The amount of organic carbon added or lost from the soil varies between crops, pasture and fallow. It is
-              also influenced by management factors such as burning of stubbles, hay or stubble removal, grazing and
-              nitrogen application.</p>
-            <p>Information is entered for each of the rotations (There is a maximum length of <strong>20</strong>
-              different crops or phases in one rotation sequence). The number of years is determined by the entry in the
-              <strong>Length of rotation in years</strong> (Simulation section) box. For example, a Fallow - Wheat -
-              Pasture rotation would have three years displayed with information required on the management of each
-              phase of the rotation.</p>
-            <p>Options: For each phase of the rotation a crop, pasture or fallow option needs to be selected.</p>
-            <table class="table table-fluid table-bordered">
-              <tr>
-                <th>Year</th>
-                <th>Stubble management</th>
-                <th>Grazed</th>
-                <th>Fertiliser N</th>
-              </tr>
-              <tr>
-                <td>1...20</td>
-                <td>Enter whether the stubble is removed or burnt. Removal may be as hay, stubble harvesting or
-                  burning.
-                </td>
-                <td>Grazing is another form of removal. The intensity of grazing determines the amount removed.</td>
-                <td>Enter the amount of nitrogen in kg/ha that is applied to the paddock.</td>
-              </tr>
-            </table>
-          </div>
-          <h3>Yields</h3>
-          <div class="border-noshadow">
-            <h4>Method of entering yields</h4>
-            <p>Socrates requires dry matter production (kg/ha) for pastures and crop yield (kg/ha) for crops.</p>
-            <h4>Enter annual yields manually</h4>
-            <p>Enter grain yields (kg/ha) for crops and dry matter production (kg/ha) for pasture. You can use your own
-              records or hypothetical values.
-              <br/>The yield is entered opposite the corresponding year. The yield figure is the yield of a crop or the
-              dry matter production (pastures) in kilograms per hectare for that season. The total dry matter production
-              (including roots) will be estimated from these figures.
-            </p>
-            <h4>Computer will calculate annual yields</h4>
-            <p>When yields are not available, Socrates can estimate them using a modified form of the French-Schultz
-              growing season rainfall (+ stored water) vs yield model (these can be modified by the user if site
-              specific data is available, see next paragraph). We assume that during as average season crops and
-              pastures will have available (before evaporation) approximately 70% of the growing season rainfall.</p>
-          </div>
-        </div>
-        <div class="basic-form">
-          <h4><a id="Results" name="Results" href="#/help#Results">RESULTS</a></h4>
-          <h3>Organic carbon (%)</h3>
-          <div class="border-noshadow">
-            <p>This graph reports the change in soil organic carbon (0-10 cm) based on the rotation, management, sol
-              type and location.</p>
-          </div>
-          <h3>Relative change in carbon</h3>
-          <div class="border-noshadow">
-            <p>This graph is the relative change per annum in soil OC (%) expressed as a percentage (not the same at
-              absolute OC % change).</p>
-          </div>
-          <h3>Yield</h3>
-          <div class="border-noshadow">
-            <p>The grain and pasture yields (kg/ha) each year</p>
-          </div>
-          <h3>Table of management</h3>
-          <div class="border-noshadow">
-            <p>this provides a summary of the crop/pasture and management imposed every year</p>
-          </div>
-          <h3>Simulation Results</h3>
-          <div class="border-noshadow">
-            <p>If you Select View Data</p>
-            <ul>
-              <li>Crop - Crop of Pasture Type.</li>
-              <li>Rain - Annual rainfall (mm).</li>
-              <li>Yield - Grain or Pasture production (kg/ha).</li>
-              <li>Biomass - the amount of carbon left after removing grain and after grazing (if any), including
-                roots.
-              </li>
-              <li>Fert - the amount of nitrogen fertiliser applied (kg N/ha).</li>
-              <li>Urine - the amount of urine (as N) produced by the animals that graze the crop residue or pasture.
-              </li>
-              <li>OC (0-10 cm) - the change in soil organic carbon over time in response to agricultural management
-                (e.g. biomass, grazing, rotation).
-              </li>
-            </ul>
-            <p>The following are all expressed as CO<sub>2</sub> equivalents (kg/ha)</p>
-            <ul>
-              <li>N<sub>2</sub>O (fertiliser) - N<sub>2</sub>O produced from the application of nitrogen fertiliser -
-                current 1% of nitrogen applied (kg N/ha). N<sub>2</sub>O Global Warming Potential = 296
-              </li>
-              <li>N<sub>2</sub>O mineralised - the amount of N<sub>2</sub>O mineralised from soil organic matter.</li>
-              <li>N<sub>2</sub>O residues - the amount of N<sub>2</sub>O produced as result of the decomposition of crop
-                and root residues.
-              </li>
-              <li>N<sub>2</sub>O (indirect) - N<sub>2</sub>O produced from volatilisation and leaching of nitrogen
-                applied as fertiliser and urine.
-              </li>
-              <li>N<sub>2</sub>O (urine) - N<sub>2</sub>O from urine from animals currently 1% of total nitrogen in
-                urine. This does not currently include N<sub>2</sub>O from dung from animals.
-              </li>
-              <li>CH<sub>4</sub> (animals) - methane produced from animals. CH<sub>4</sub> Global Warming Potential = 34
-              </li>
-              <li>Total - total greenhouse gas emissions<br/>
-                As each year is calculated, the cumulative emissions (i.e. adding successive years) is displayed.
-              </li>
-            </ul>
+          <div class="basic-form">
+            <h2>RESULTS</h2>
+            <h3>Organic carbon (%)</h3>
+            <div class="border-noshadow">
+              <p>This graph reports the change in soil organic carbon (0-10 cm) based on the rotation, management, sol
+                type and location.</p>
+            </div>
+            <h3>Yield</h3>
+            <div class="border-noshadow">
+              <p>The grain and pasture yields (kg/ha) each year</p>
+            </div>
+            <h3>Table of management</h3>
+            <div class="border-noshadow">
+              <p>this provides a summary of the crop/pasture and management imposed every year</p>
+            </div>
+            <h3>Simulation Results</h3>
+            <div class="border-noshadow">
+              <p>An annualised output table is provided including:</p>
+              <ul>
+                <li>Crop - Crop of Pasture Type.</li>
+                <li>Rain - Annual rainfall (mm).</li>
+                <li>Yield - Grain or Pasture production (kg/ha).</li>
+                <li>Biomass - the amount of carbon left after removing grain and after grazing (if any), including
+                  roots.
+                </li>
+                <li>Fert - the amount of nitrogen fertiliser applied (kg N/ha).</li>
+                <li>Urine - the amount of urine (as N) produced by the animals that graze the crop residue or pasture.
+                </li>
+                <li>OC (0-10 cm) - the change in soil organic carbon (%) over time in response to agricultural
+                  management
+                  (e.g. biomass, grazing, rotation).
+                </li>
+              </ul>
+              <p>The following are all expressed as CO<sub>2</sub> equivalents (kg/ha) using GWPs from the IPCC Fifth
+                Assessment Report, N<sub>2</sub>O = 265, CH<sub>4</sub> = 28</p>
+              <ul>
+                <li>N<sub>2</sub>O (fertiliser) - N<sub>2</sub>O produced from the application of nitrogen fertiliser -
+                  current 1% of nitrogen applied (kg N/ha). N<sub>2</sub>O Global Warming Potential = 296
+                </li>
+                <li>N<sub>2</sub>O mineralised - the amount of N<sub>2</sub>O produced from the nitrogen mineralised
+                  from soil organic matter.
+                </li>
+                <li>N<sub>2</sub>O residues - the amount of N<sub>2</sub>O produced as result of the decomposition of
+                  crop
+                  and root residues.
+                </li>
+                <li>N<sub>2</sub>O (indirect) - N<sub>2</sub>O produced from volatilisation of nitrogen
+                  applied as fertiliser and urine.
+                </li>
+                <li>N<sub>2</sub>O (urine) - N<sub>2</sub>O from urine from animals currently 1% of total nitrogen in
+                  urine. This does not currently include N<sub>2</sub>O from dung from animals.
+                </li>
+                <li>CH<sub>4</sub> (animals) - methane produced from animals.
+                </li>
+                <li>Total - total greenhouse gas emissions<br/>
+                  As each year is calculated, the cumulative emissions (i.e. adding successive years) are displayed.
+                </li>
+              </ul>
+            </div>
           </div>
         </div>
-      </div>
-    </el-col>
-  </el-row>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <style scoped>
diff --git a/src/components/Input.vue b/src/components/Input.vue
index d4ae8e7..420e529 100644
--- a/src/components/Input.vue
+++ b/src/components/Input.vue
@@ -1,5 +1,5 @@
 <script setup lang="js">
-import {reactive, ref, toRaw} from 'vue';
+import {reactive, ref, toRaw, onMounted} from 'vue';
 import {storeToRefs} from 'pinia';
 
 import Defaults from '../defaults.js';
@@ -11,6 +11,10 @@ import {isEmpty} from "lodash";
 
 const store = useStore();
 
+onMounted(async () => {
+  await store.getParameters();
+});
+
 const soils = [
   {id: 0, type: 'clay', name: 'clay'},
   {id: 1, type: 'silt', name: 'silt clay'},
@@ -165,12 +169,20 @@ function socratesToData() {
       if ((!r.plant && r.plant !== 0) || r.plant < 0 || r.plant > 7) {
         store.errors.push(`Missing or incorrect plant in rotation year #${r.year}`);
       } else {
-        if ((!r.stubble && r.stubble !== 0)) {
-          store.errors.push(`Stubble management missing in rotation year #${r.year}`);
+        if (r.plant < 5) { // Don't test stubble if plant is fallow, or pasture
+          if ((!r.stubble && r.stubble !== 0)) {
+            store.errors.push(`Stubble management missing in rotation year #${r.year}`);
+          }
         }
         if ((!r.fertiliser && r.fertiliser !== 0)) {
           store.errors.push(`Fertiliser missing in rotation year #${r.year}`);
         }
+        if (r.plant !== 6) { // Don't test graze if plant is fallow
+          if (!r.graze && r.graze !== 0) {
+            debugger
+            store.errors.push(`Graze management missing in rotation year #${r.year}`);
+          }
+        }
       }
       store.socrates.rotation.push(r);
     }
@@ -192,7 +204,7 @@ function socratesToData() {
         }
         store.socrates.yields['annual_yields'].push(yy);
       }
-      console.log(JSON.stringify(store.annualYields));
+      // console.log(JSON.stringify(store.annualYields));
       if (yieldErrors.length > 0) {
         yieldErrors.push('Missing: some yield values');
       }
@@ -449,9 +461,13 @@ function isIterable(obj) {
           <h3>Climate</h3>
           <el-row>
             <el-col class="py-1">
-              <div class="px-1">
-                <span>Method of entering data</span>
-                <el-select v-model="store.climateMethodDataEntry" class="m-2" placeholder="Select">
+              <el-row >
+                <el-col :xl="4" :lg="4" :md="4" :sm="24" :xs="24">
+                  <div>Method of entering data</div>
+                </el-col>
+                <el-col :xl="20" :lg="20" :md="20" :sm="24" :xs="24">
+                  <div>
+                <el-select v-model="store.climateMethodDataEntry" class="w-full" placeholder="Select">
                   <el-option
                       label="Enter yearly rainfall & mean temperature"
                       :value="0"/>
@@ -476,7 +492,9 @@ function isIterable(obj) {
                            @click="store.toggleYearlyClimate = !store.toggleYearlyClimate">
                   {{ store.toggleYearlyClimate ? 'Hide Yearly Rain' : 'Show Yearly Rain' }}
                 </el-button>
-              </div>
+                  </div>
+                </el-col>
+              </el-row>
             </el-col>
             <el-col class="py-1">
             <span class="input-group-addon">
@@ -574,23 +592,26 @@ function isIterable(obj) {
               </el-select>
             </el-col>
             <el-col :span="5" class="p-2">
-              <el-select v-model="rotation['stubble']">
-                <el-option v-for="stubble in stubbles"
-                           :key="stubble.id"
-                           :label="stubble.name"
-                           :value="stubble.id"/>
-              </el-select>
+              <div v-if="rotation['plant'] < 5 ">
+                <el-select v-model="rotation['stubble']"
+                           :disabled="rotation['plant'] === 5 || rotation['plant'] === 6 || rotation['plant'] === 7">
+                  <el-option v-for="stubble in stubbles"
+                             :key="stubble.id"
+                             :label="stubble.name"
+                             :value="stubble.id"/>
+                </el-select>
+              </div>
             </el-col>
             <el-col :span="5" class="p-2">
-              <el-select v-model="rotation['graze']"
-                         clearable
-                         :disabled="rotation['stubble'] === 0">
-                <el-option v-for="graze in grazes"
-                           :key="graze.id"
-                           :label="graze.name"
-                           :value="graze.id"
-                           :disabled="rotation['stubble'] === 0"/>
-              </el-select>
+              <div v-if="rotation['plant'] !== 6">
+                <el-select v-model="rotation['graze']"
+                           :disabled="rotation['plant'] === 6">
+                  <el-option v-for="graze in grazes"
+                             :key="graze.id"
+                             :label="graze.name"
+                             :value="graze.id"/>
+                </el-select>
+              </div>
             </el-col>
             <el-col :span="5" class="p-2">
               <el-input v-model="rotation['fertiliser']"/>
@@ -616,26 +637,31 @@ function isIterable(obj) {
           <h3>Yields</h3>
           <el-row>
             <el-col class="py-1">
-              <div>
-                <span class="input-group-addon">Method of entering yield</span>
-                <el-select v-model="store.yieldsMethodDataEntry"
-                           class="m-2" placeholder="Select"
-                           @change="store.selectYield">
-                  <el-option
-                      label="Enter annual yields manually"
-                      :value="0"/>
-                  <el-option
-                      label="Computer will calculate annual yields"
-                      :value="1"/>
-                </el-select>
-                <span class="input-group-addon">
-              <a href="#" id="yieldEdit" rel="popover"><i class="glyphicon glyphicon-edit"></i></a>
-            </span>
-                <el-button v-if="store.yieldsMethodDataEntry===0"
-                           @click="store.toggleAnnualYields = !store.toggleAnnualYields">
-                  {{ store.toggleAnnualYields ? 'Hide Annual Yields' : 'Show Annual Yields' }}
-                </el-button>
-              </div>
+              <el-row >
+                <el-col :xl="4" :lg="4" :md="4" :sm="24" :xs="24">
+                  <div>
+                    Method of entering yield
+                  </div>
+                </el-col>
+                <el-col :xl="20" :lg="20" :md="20" :sm="24" :xs="24">
+                  <div>
+                    <el-select v-model="store.yieldsMethodDataEntry"
+                               class="w-full" placeholder="Select"
+                               @change="store.selectYield">
+                      <el-option
+                          label="Enter annual yields manually"
+                          :value="0"/>
+                      <el-option
+                          label="The model will calculate annual yields"
+                          :value="1"/>
+                    </el-select>
+                    <el-button class="my-2" v-if="store.yieldsMethodDataEntry===0"
+                               @click="store.toggleAnnualYields = !store.toggleAnnualYields">
+                      {{ store.toggleAnnualYields ? 'Hide Annual Yields' : 'Show Annual Yields' }}
+                    </el-button>
+                  </div>
+                </el-col>
+              </el-row>
             </el-col>
           </el-row>
           <el-drawer title="Annual Yields" v-model="store.toggleAnnualYields" direction="rtl" :with-header="false"
diff --git a/src/components/layouts/BaseHeader.vue b/src/components/layouts/BaseHeader.vue
index 469c28e..f7d7eb1 100644
--- a/src/components/layouts/BaseHeader.vue
+++ b/src/components/layouts/BaseHeader.vue
@@ -5,13 +5,9 @@ import { toggleDark } from "~/composables";
 <template>
   <el-menu class="el-menu-demo" mode="horizontal" :router="true">
     <el-menu-item index="/input">SOCRATES</el-menu-item>
-    <el-sub-menu index="/help">
-      <template #title>Help</template>
-      <el-menu-item index="/help#Inputs">Inputs</el-menu-item>
-      <el-menu-item index="/help#Results">Results</el-menu-item>
-    </el-sub-menu>
-    <el-menu-item index="/contact">Contact</el-menu-item>
     <el-menu-item index="/about">About</el-menu-item>
+    <el-menu-item index="/help">Help</el-menu-item>
+    <el-menu-item index="/contact">Contact</el-menu-item>
     <el-menu-item h="full" @click="toggleDark()">
       <button
         class="border-none w-full bg-transparent cursor-pointer"
diff --git a/src/defaults.js b/src/defaults.js
index cfd1024..38033c8 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -1,56 +1,4 @@
+
 export default class Defaults {
   static version = '1.0.0';
-  static getParameters() {
-    return {
-      "cnRate_1": 0.84,
-      "cnRate_2": 0.07,
-      "cnRate_3": 0.055,
-      "cnRate_4": 0.0009,
-      "cnRate_5": 0.95,
-      "labile": 2,
-      "stable": 98,
-      "pastureMf": 0.16,
-      "fallowMf": 0.9,
-      "cropMf": 0.26,
-      "bd": 1.3,
-      "dlayr": 10,
-      "depth30_10": 2.33,
-      "cn": 60,
-      "porghum": 0.03,
-      "grz": 0.6,
-      "rootGrz": 0.55,
-      "rootP": 0.5,
-      "rootGl": 0.4,
-      "rootWgt": 0.4,
-      "hi_0": 0.42,
-      "hi_1": 0.42,
-      "hi_2": 0.42,
-      "hi_3": 0.42,
-      "hi_4": 0.35,
-      "hi_5": 1,
-      "hi_6": 1,
-      "hi_7": 1,
-      "storedHFC": 3,
-      "tempAmplitude": 30,
-      "rainAmplitude": 30,
-      "tempRand": 20,
-      "precipRand": 30,
-      "annpar": 75,
-      "heavyRetained": 40,
-      "lightRetained": 70,
-      "baseRetained": 88,
-      "nurate": 0.2,
-      "tam": 48.5,
-      "ef1": 0.01,
-      "ef2": 0.0075,
-      "n2o_n": 1.57,
-      "gwpn2o": 265,
-      "co2_c": 3.67,
-      "fracf": 0.1,
-      "fracu": 0.2,
-      "fracl": 0.3,
-      "ch4_sheep": 8,
-      "gwp_ch4": 28
-    }
-  }
 }
diff --git a/src/model.service.js b/src/model.service.js
index 80b10fb..28eb2c9 100644
--- a/src/model.service.js
+++ b/src/model.service.js
@@ -1,6 +1,11 @@
 export async function run({socrates, parameters}) {
-  //let response = await fetch("/run", { // For debugging local
-  let response = await fetch("https://api.socrates-soil.net/run", {
+  let url;
+  if (import.meta.env) {
+    url = "/run"; // For debugging local when running vite in dev mode
+  } else {
+    url = "https://api.socrates-soil.net/run";
+  }
+  let response = await fetch(url, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -19,6 +24,17 @@ export async function run({socrates, parameters}) {
   }
 }
 
+export async function parameters() {
+  let response = await fetch('parameters.json');
+  let status = response.status;
+  response = await response.json();
+  if (status === 200) {
+    return response;
+  } else {
+    throw new Error(response?.message);
+  }
+}
+
 export async function sampleData() {
   let response = await fetch('sample-data-20-year.json');
   if (response.status === 200) {
diff --git a/src/store.js b/src/store.js
index 4089569..77a6cd0 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia'
 import Defaults from './defaults';
+import {parameters} from "~/model.service.js";
 
 export const useStore = defineStore({
   id: 'input',
@@ -26,7 +27,7 @@ export const useStore = defineStore({
     randomizeRainAndTemperature: 0,
     rotationTable: [],
     yieldsMethodDataEntry: 0,
-    parameters: Defaults.getParameters(),
+    parameters: [],
     showParameters: false,
     results: null,
     socrates: {
@@ -49,6 +50,9 @@ export const useStore = defineStore({
   }),
   actions: {
     // Define your actions here
+    async getParameters(){
+      this.parameters = await parameters();
+    },
     deleteRotation(index) {
       this.rotationTable.splice(index, 1);
       this.rotationLength--;
@@ -98,8 +102,8 @@ export const useStore = defineStore({
     updateMonthRainTemps({monthRainTemp}) {
       this.monthRainTemp = monthRainTemp;
     },
-    resetParameters() {
-      this.parameters = Defaults.getParameters();
+    async resetParameters() {
+      await this.getParameters();
     }
   },
 });