Merge pull request #23 from balmorelcommunity:merge

Improvements from Kountouris et al. 2024

.gitignore

@@ -16,5 +16,14 @@
 **/model/Balmorel.l*
 **/output/economic/*.*
 /base/bui/gamsscr/*.*
-
-
+*.gsp
+base/data/.gitignore
+base/data/README.md
+*.lst
+*.log
+*.lxi
+*.pf
+*.log~1
+*.log~2
+*.log~3
+%batfileMERGEWITHBASE%

README.md

@@ -1,5 +1,6 @@
 # Balmorel
 
+The Balmorel energy system model. Data is included in the [Balmorel_data repository](https://github.com/balmorelcommunity/Balmorel_data), which we recommend cloning to base/ for version control of both base data and framework. Note: The cloned folder should be renamed from "Balmorel_data" to "data" to function properly.
 A scenario that's possible to run with an academic trial license of GAMS can be found in the balmorel-demo branch.
 
 ## What is Balmorel?
@@ -20,4 +21,32 @@ Balmorel is a modelling tool that can be used by energy system experts, energy c
 
 ## How is Balmorel supported and further developed?
 
-The model is developed and distributed under open source ideals. The source code has been provided on its homepage since 2001 and was assigned the [ISC license](https://opensource.org/licenses/ISC) in 2017. Ample documentation is available in the folder [within this repository](base/documentation). Application examples and contact information can be found on the [Balmorel homepage](https://balmorel.com). Presently the model development is mainly project driven, with a users' network around it, supporting the open source development idea.
+The model is developed and distributed under open source ideals. The source code has been provided on its homepage since 2001 and was assigned the [ISC license](https://opensource.org/licenses/ISC) in 2017. Ample documentation is available in the folder [within this repository](base/documentation). We also refer to information on [openmod](https://wiki.openmod-initiative.org/wiki/Balmorel). Presently the model development is mainly project driven, with a users' network around it, supporting the open source development idea.
+
+### Procedure for Merging Changes to Master
+
+The Balmorel team of DTU Management, Energy Economics and Modelling has decided on the following procedure for merging new changes to the master:
+1. A decision to merge should be agreed upon in a Balmorel meeting with the admins
+2. Create a new branch from master, which will be used as a temporary branch to do all the changes
+3. Make the desired changes in a new scenario:
+
+    a. Add a new scenario called 'changes', which the following files and folder structure (copy Balmorel.gms and cplex.op4 from base/model if nothing is to be changed in these files):
+
+        Balmorel
+        ├── base
+        ├── changes
+        │   ├── data
+        │   └── model
+        │       ├── cplex.op4
+        │       └── Balmorel.gms 
+        ├── simex
+        ├── README.md
+        ├── .gitignore
+        └── .gitattributes
+
+    b. Keep the base scenario identical to the current master and apply all changes to the 'changes' scenario
+
+4. Run the [test script](base/auxils/master_merge_tests/merge_tests.ipynb), make sure that the model stays feasible and that the results make sense
+5. Consider critically if the tests performed in 4. is enough to verify and validate the changes made
+6. Make a pull request with the changes and report them in general terms, including the KPI outputs from the tests in 4. in ... (todo: check where it makes sense to put these descriptions, as simple as possible)
+

base/addons/hydrogen/bb4/hydrogen_balbase4.inc

@@ -1,28 +1,40 @@
-
-
-   QHYDROGEN_HGEHTOH2
-   QHYDROGEN_HGETOHH2
-   QHYDROGEN_H2TOEH
-   QHYDROGEN_EQ
-   QHYDROGEN_EQ_AREA
-   QHYDROGEN_STOMAXCON
-   QHYDROGEN_STOMAXLOAD
-   QHYDROGEN_STOMAXUNLD
-   QHYDROGEN_STOVOL
-   QHYDROGEN_GCH4KT_UP
-   QBIOMETHANE_EQ
-   QBIOMETHANE_STOVOLTS
-   QGKBIOMETHANE_UP
-   QGKBIOGASUPGRADING_UP
-   QGKBIOGASMETHANATION_UP
-
-
-   QXH2K_UP
-$ifi %H2TransInvest%==yes  QXH2KNACCUMNET
-$ifi %H2TransInvest%==yes  QXH2KNACCUMNET_NGTOH2
-$ifi %H2TransInvest%==yes  QXH2INVSYMMETRY
-$ifi %H2TransInvest%==yes  QXH2INVSYMMETRY_NGTOH2
-$ifi %H2TransInvest%==yes  QXH2KMAX_NGTOH2
-$ifi %H2TransInvest%==yes  QVXH2KN_ES
-$ifi %H2TransInvest%==yes  QXH2LAMBDA_ES
-
+
+
+   QHYDROGEN_HGEHTOH2
+   QHYDROGEN_HGETOHH2
+   QHYDROGEN_H2TOEH
+   QHYDROGEN_EQ
+   QHYDROGEN_EQ_AREA
+   QHYDROGEN_STOMAXCON
+   QHYDROGEN_STOMAXLOAD
+   QHYDROGEN_STOMAXUNLD
+   QHYDROGEN_STOVOL
+   QHYDROGEN_GCH4KT_UP
+$ifi %COMBTECH%==yes   QHYDROGENGKE_UP_ADD
+   QBIOMETHANE_EQ
+   QBIOMETHANE_STOVOLTS
+   QGKBIOMETHANE_UP
+   QGKBIOGASUPGRADING_UP
+   QGKBIOGASMETHANATION_UP
+
+
+
+   QXH2K_UP
+$ifi %H2TransInvest%==yes  QXH2KNACCUMNET
+$ifi %H2TransInvest%==yes  QXH2KNACCUMNET_NGTOH2
+$ifi %H2TransInvest%==yes  QXH2INVSYMMETRY
+$ifi %H2TransInvest%==yes  QXH2INVSYMMETRY_NGTOH2
+$ifi %H2TransInvest%==yes  QXH2KMAX_NGTOH2
+$ifi %H2TransInvest%==yes  $ifi %ES_H2TRANS%==yes  QVXH2KN_ES
+$ifi %H2TransInvest%==yes  $ifi %ES_H2TRANS%==yes  QXH2LAMBDA_ES
+
+* Flexible hydrogen demand in space by Ioannis
+$ifi not %flexible_h2_space%==yes $goto no_flexible_h2_space
+QSYNTHETIC_EQ_PRODUCTION
+QSYNTHETIC_EQ_SHIFT
+QSYNTHETIC_EQ_SHIFT_UP
+QSYNTHETIC_EQ_SHIFT_DOWN
+QSYNTHETIC_EQ_SHIFT_BALANCE_MOVE
+QSYNTHETIC_EQ_SHIFT_BALANCE_OVERALL
+$label no_flexible_h2_space
+