Merge pull request #31 from rschuchmann/process-commodity-description

Add process/commodity descriptions to app
GAMS-dev · Apr 12, 2022 · 28a9467 · 28a9467
2 parents 20f8625 + 6a7d405
commit 28a9467
Show file tree

Hide file tree

Showing 24 changed files with 138 additions and 198 deletions.
diff --git a/conf_times_miro/times_miro.json b/conf_times_miro/times_miro.json
@@ -18,7 +18,7 @@
   "aggregateWidgets": true,
   "defaultScenName": "default",
   "overwriteSheetOrder": {
-    "input": ["_widgets", "scenddmap", "cubeinput", "timeslice", "milestonyr", "extensions", "solveropt"]
+    "input": ["_widgets", "scenddmap", "cubeinput", "timeslice", "milestonyr", "extensions", "solveropt", "dd_prc_desc", "dd_com_desc"]
   },
   "overwriteAliases": {
     "timeslice": {
@@ -65,6 +65,15 @@
     },
     "gmsobj": {
       "newAlias": "Choice of objective function formulations"
+    },
+    "gmsrunmode": {
+      "newAlias": "whether to create a MIRO scenario or solve TIMES"
+    },
+    "dd_prc_desc": {
+      "newAlias": "Process Description"
+    },
+    "dd_com_desc": {
+      "newAlias": "Commodity Description"
     }
   },
   "dataRendering": {
@@ -94,7 +103,8 @@
       }
     },
     "cubeinput": {
-      "outType": "mirorenderer_cubeinput"
+      "outType": "mirorenderer_cubeinput",
+      "additionalData": ["dd_prc_desc", "dd_com_desc"]
     }
   },
   "saveTraceFile": false,
@@ -235,6 +245,12 @@
     },
     "cubeoutput": {
       "newHeaders": ["Attribute", "Sow", "Commodity", "Process", "Period", "Region", "Vintage", "Time Slice", "User Constraint", "value"]
+    },
+    "dd_prc_desc": {
+      "newHeaders": ["DD file", "Region", "Process", "Description"]
+    },
+    "dd_com_desc": {
+      "newHeaders": ["DD file", "Region", "Commodity", "Description"]
     }
   },
   "extraClArgs": ["--gmsrunopt=local", "--DDPREFIX=dd_files/"],
@@ -246,10 +262,19 @@
   "defaultRendererOutput": "miroPivot",
   "pivotCompSettings": {
     "enableHideEmptyCols": true,
-    "emptyUEL": "-"
+    "emptyUEL": "-",
+    "hidePivotControls": false,
+    "fixedColumns": true
   },
+  "inputGroups": [
+    {
+      "name": "Symbol descriptions",
+      "members": ["dd_prc_desc", "dd_com_desc"],
+      "sameTab": false
+    }
+  ],
   "handsontable": {
-    "stretchH": "none",
+    "stretchH": "last",
     "readonly": false,
     "manualColumnResize": true,
     "contextMenu": {
@@ -258,6 +283,6 @@
       "allowColEdit": true
     },
     "height": 700,
-    "colWidths": 100
+    "colWidths": 150
   }
 }
diff --git a/conf_times_miro/times_miro_io.json b/conf_times_miro/times_miro_io.json
@@ -176,6 +176,50 @@
 					"alias":	"cubeinput"
 				}
 			}
+		},
+		"dd_prc_desc":	{
+			"alias":	"dd_prc_desc",
+			"symtype":	"set",
+			"headers":	{
+				"uni":	{
+					"type":	"string",
+					"alias":	"Universal set"
+				},
+				"uni#1":	{
+					"type":	"string",
+					"alias":	"Universal set"
+				},
+				"uni#2":	{
+					"type":	"string",
+					"alias":	"Universal set"
+				},
+				"text":	{
+					"type":	"string",
+					"alias":	"Set text "
+				}
+			}
+		},
+		"dd_com_desc":	{
+			"alias":	"dd_com_desc",
+			"symtype":	"set",
+			"headers":	{
+				"uni":	{
+					"type":	"string",
+					"alias":	"Universal set"
+				},
+				"uni#1":	{
+					"type":	"string",
+					"alias":	"Universal set"
+				},
+				"uni#2":	{
+					"type":	"string",
+					"alias":	"Universal set"
+				},
+				"text":	{
+					"type":	"string",
+					"alias":	"Set text "
+				}
+			}
 		}
 	},
 	"outputSymbols":	{

diff --git a/data_times_miro/default.gdx b/data_times_miro/default.gdx
diff --git a/data_times_miro/times_miro_DK_Alternativet.miroscen b/data_times_miro/times_miro_DK_Alternativet.miroscen
diff --git a/data_times_miro/times_miro_DK_CB20.miroscen b/data_times_miro/times_miro_DK_CB20.miroscen
diff --git a/data_times_miro/times_miro_DK_DCCC.miroscen b/data_times_miro/times_miro_DK_DCCC.miroscen
diff --git a/data_times_miro/times_miro_DK_EA_2018.miroscen b/data_times_miro/times_miro_DK_EA_2018.miroscen
diff --git a/data_times_miro/times_miro_DK_Fossilfri_2040.miroscen b/data_times_miro/times_miro_DK_Fossilfri_2040.miroscen
diff --git a/data_times_miro/times_miro_DK_Fossilfri_2050.miroscen b/data_times_miro/times_miro_DK_Fossilfri_2050.miroscen
diff --git a/data_times_miro/times_miro_DK_Frozen_policy_scenarie.miroscen b/data_times_miro/times_miro_DK_Frozen_policy_scenarie.miroscen
diff --git a/data_times_miro/times_miro_DK_International_bunkering.miroscen b/data_times_miro/times_miro_DK_International_bunkering.miroscen
diff --git a/data_times_miro/times_miro_DK_International_bunkering_2040.miroscen b/data_times_miro/times_miro_DK_International_bunkering_2040.miroscen
diff --git a/data_times_miro/times_miro_DK_Radikale_Venstre.miroscen b/data_times_miro/times_miro_DK_Radikale_Venstre.miroscen
diff --git a/data_times_miro/times_miro_DK_Regeringen.miroscen b/data_times_miro/times_miro_DK_Regeringen.miroscen
diff --git a/data_times_miro/times_miro_DK_Socialdemokratiet.miroscen b/data_times_miro/times_miro_DK_Socialdemokratiet.miroscen
diff --git a/data_times_miro/times_miro_Starter_B_VTS-UC90.miroscen b/data_times_miro/times_miro_Starter_B_VTS-UC90.miroscen
diff --git a/data_times_miro/times_miro_Starter_P-CO2L20.miroscen b/data_times_miro/times_miro_Starter_P-CO2L20.miroscen
diff --git a/data_times_miro/times_miro_Starter_P-CO2L30.miroscen b/data_times_miro/times_miro_Starter_P-CO2L30.miroscen
diff --git a/data_times_miro/times_miro_Starter_P-LIMELC.miroscen b/data_times_miro/times_miro_Starter_P-LIMELC.miroscen