Merge pull request #423 from SchmidtDSE/main

Fast forward deploy.
SchmidtDSE · Sep 9, 2024 · 0c4880f · 0c4880f
2 parents 9661ec6 + 7df92d1
commit 0c4880f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/js/version.txt b/js/version.txt
@@ -1 +1 @@
-20240909
+20240910
diff --git a/pt/index.json_template b/pt/index.json_template
@@ -27,8 +27,8 @@
                 {% endfor %}
                 {% for region in regions %}
                 {
-                    "name": "{{ region['label'] }} Non-Durable SUP Reduction",
-                    "description": "Percent reduction in non-durable single use packaging (excludes polystyrene) in {{ region['full'] }}. Use 100% for ban. Assumes more immediate policy implementation with short phase in.",
+                    "name": "{{ region['label'] }} SUP Reduction",
+                    "description": "Percent reduction in single use packaging (excludes polystyrene) in {{ region['full'] }}. Use 100% for ban. Assumes more immediate policy implementation with short phase in.",
                     "min": 0,
                     "max": 100,
                     "default": 0,
@@ -1553,8 +1553,8 @@
                 {% endfor %}
                 {% for region in regions %}
                 {
-                    "name": "{{ region['label'] }} Non-Durable SUP Percent",
-                    "description": "What percent of non-polystyrene plastic packaging in {{ region['full'] }} is non-durable single use.",
+                    "name": "{{ region['label'] }} SUP Percent",
+                    "description": "What percent of non-polystyrene plastic packaging in {{ region['full'] }} is single use.",
                     "min": 0,
                     "max": 100,
                     "default": {{ region['constants']['percentPackagingSingleUse'] }},

diff --git a/pt/scenarios.json b/pt/scenarios.json
@@ -3,7 +3,7 @@
     {
       "name": "<option> Reduction in Single Use Packaging",
       "id": "ban-single-use",
-      "description": "Policy which globally reduces (non-durable) single use packaging like through product-specific bans. Assumes a shorter term implementation and compliance.",
+      "description": "Policy which globally reduces single use packaging like through product-specific bans. Assumes a shorter term implementation and compliance.",
       "config": {
         "options": [
           {

diff --git a/pt/simulation.pt b/pt/simulation.pt
@@ -44,6 +44,12 @@ in.eu30TaxMultiplier = draw uniformly from 0.559 to 0.580;
 in.naftaTaxMultiplier = draw uniformly from 0.111 to 0.125;
 in.rowTaxMultiplier = draw uniformly from 0.221 to 0.240;
 
+# Single use percentage
+in.chinaPercentSingleUse = draw uniformly from 40 to 60;
+in.eu30PercentSingleUse = draw uniformly from 40 to 60;
+in.naftaPercentSingleUse = draw uniformly from 40 to 60;
+in.rowPercentSingleUse = draw uniformly from 40 to 60;
+
 # == Apply BAU sampling ==
 in.chinaPreConsumptionMultiplier = 100;  # Enable China consumption offset
 in.eu30PreConsumptionMultiplier = 100;  # Enable EU30 consumption offset

diff --git a/regions.json b/regions.json
@@ -45,12 +45,12 @@
                 "landfillCost": 126,
                 "packagingTaxPower": 0.519,
                 "packagingTaxMultiplier": 0.168,
-                "percentRecyclingYieldLoss": 20,
+                "percentRecyclingYieldLoss": 25,
                 "percentReuseExhaustion": 12,
                 "percentIncinerationPlastic": 12,
                 "percentLandfillPlastic": 12,
                 "percentPackagingPs": 1.3,
-                "percentPackagingSingleUse": 38,
+                "percentPackagingSingleUse": 50,
                 "minConsumptionTax": 0,
                 "maxConsumptionTax": 19,
                 "consumptionErrorMean": 0.00,
@@ -108,7 +108,7 @@
                 "landfillCost": 225,
                 "packagingTaxPower": 1.082,
                 "packagingTaxMultiplier": 0.024,
-                "percentRecyclingYieldLoss": 20,
+                "percentRecyclingYieldLoss": 25,
                 "percentReuseExhaustion": 12,
                 "percentIncinerationPlastic": 11.5,
                 "percentLandfillPlastic": 11.5,
@@ -171,12 +171,12 @@
                 "landfillCost": 175,
                 "packagingTaxPower": 0.247,
                 "packagingTaxMultiplier": 0.329,
-                "percentRecyclingYieldLoss": 20,
+                "percentRecyclingYieldLoss": 25,
                 "percentReuseExhaustion": 12,
                 "percentIncinerationPlastic": 12,
                 "percentLandfillPlastic": 12,
                 "percentPackagingPs": 1.7,
-                "percentPackagingSingleUse": 54,
+                "percentPackagingSingleUse": 50,
                 "minConsumptionTax": 0,
                 "maxConsumptionTax": 13,
                 "consumptionErrorMean": 0.00,
@@ -234,12 +234,12 @@
                 "landfillCost": 74,
                 "packagingTaxPower": 0.862,
                 "packagingTaxMultiplier": 0.062,
-                "percentRecyclingYieldLoss": 20,
+                "percentRecyclingYieldLoss": 25,
                 "percentReuseExhaustion": 12,
                 "percentIncinerationPlastic": 12,
                 "percentLandfillPlastic": 12,
                 "percentPackagingPs": 1.7,
-                "percentPackagingSingleUse": 48,
+                "percentPackagingSingleUse": 50,
                 "minConsumptionTax": 0,
                 "maxConsumptionTax": 14,
                 "consumptionErrorMean": 0.00,

diff --git a/service_worker_v2.js b/service_worker_v2.js
@@ -52,9 +52,10 @@ const OLD_CACHES = [
     "GlobalPlasticsTool_20240905",
     "GlobalPlasticsTool_20240906",
     "GlobalPlasticsTool_20240907",
-    "GlobalPlasticsTool_20240908"
+    "GlobalPlasticsTool_20240908",
+    "GlobalPlasticsTool_20240909",
 ];
-const CACHE_NAME = "GlobalPlasticsTool_20240909";
+const CACHE_NAME = "GlobalPlasticsTool_20240910";
 const ESSENTIAL_FILES = [
     "/css/README.md",
     "/css/base.css",

diff --git a/template/base.html b/template/base.html
@@ -785,6 +785,7 @@ <h2>Model Information</h2>
                                 Model outputs are converted to polymers and GHG with some numerical smoothing as documented in <a href="/~https://github.com/SchmidtDSE/plastics-prototype">our tool repository</a> in which up to 1 Mt of imprecision is allowed. For additional details, see the <a href="https://global-plastics-tool.org/pdf/polymers_and_ghg.pdf">technical GHG and polymers write up</a>. Model version 2024.15 (pre-release). Tool last updated 2024-09-07. Major edits after initial release include:
 
                                 <ul>
+                                    <li>Put % single use into monte carlo and center default yield loss on 2024-09-09.</li>
                                     <li>Switch to PPP for tax on 2024-09-07.</li>
                                     <li>Expanded Monte Carlo (includes tax) on 2024-09-06.</li>
                                     <li>Monte Carlo options on 2024-09-05.</li>
@@ -1002,7 +1003,7 @@ <h2>Table of Contents</h2>
             <a class="tab-trigger" href="#about-privacy">Privacy</a> / <a class="tab-trigger" href="#about-license">Terms</a> / <a class="tab-trigger" href="/~https://github.com/SchmidtDSE/plastics-prototype">Open Source</a> / <a class="tab-trigger" href="#about-contact">Contact</a> / <a class="tab-trigger" href="#toc">Table of Contents</a> / <a class="tab-trigger" href="#settings">Accessibility</a> / <a class="tab-trigger" href="#about-publication">Cite Us</a>
         </footer>
 
-        <input type="hidden" id="version-number" value="20240909">
+        <input type="hidden" id="version-number" value="20240910">
 
         <dialog id="add-dialog">
             <form>