fixed help, parameters, rotation and some styles

soil-and-land · Nov 21, 2023 · a7fdbe6 · a7fdbe6
1 parent 9815d98
commit a7fdbe6
Show file tree

Hide file tree

Showing 11 changed files with 396 additions and 444 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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:[email protected]">[email protected]</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:[email protected]">[email protected]</a>
+            </p>
+          </div>
         </div>
-      </div>
-    </el-col>
-  </el-row>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <style scoped>