Merge pull request #727 from vartika271987/waterTest

Bugfix in water cost equation

CHANGELOG.md

@@ -3,20 +3,10 @@
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-
 ## [Unreleased]
 
 ### changed
--
-
-### added
--
-
-### removed
--
-
-### fixed
--
+- **11_costs** changed equation to fix bug in total water cost calculation 
 
 
 ## [4.8.2] - 2024-09-24

main.gms

@@ -148,24 +148,23 @@ $title magpie
 
 *##################### R SECTION START (VERSION INFO) ##########################
 * 
-* Used data set: rev4.109_h12_magpie.tgz
+* Used data set: rev4.111_h12_magpie.tgz
 * md5sum: NA
-* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+* Repository: https://rse.pik-potsdam.de/data/magpie/public
 * 
-* Used data set: rev4.109_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
+* Used data set: rev4.111_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
 * md5sum: NA
-* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+* Repository: https://rse.pik-potsdam.de/data/magpie/public
 * 
-* Used data set: rev4.109_h12_validation.tgz
+* Used data set: rev4.111_h12_validation.tgz
 * md5sum: NA
-* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+* Repository: https://rse.pik-potsdam.de/data/magpie/public
 * 
-* Used data set: additional_data_rev4.50.tgz
+* Used data set: additional_data_rev4.53.tgz
 * md5sum: NA
 * Repository: https://rse.pik-potsdam.de/data/magpie/public
-
 * 
-* Used data set: calibration_H12_26Mar24.tgz
+* Used data set: calibration_H12_26Mar24_fixed.tgz
 * md5sum: NA
 * Repository: https://rse.pik-potsdam.de/data/magpie/public
 * 
@@ -180,11 +179,11 @@ $title magpie
 * 
 * Regionscode: 62eff8f7
 * 
-* Regions data revision: 4.109
+* Regions data revision: 4.111
 * 
 * lpj2magpie settings:
 * * LPJmL data: MRI-ESM2-0:ssp370
-* * Revision: 4.109
+* * Revision: 4.111
 * 
 * aggregation settings:
 * * Input resolution: 0.5
@@ -196,8 +195,7 @@ $title magpie
 * * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler,     error = errorHandler)
 * 
 * 
-* Last modification (input data): Tue Jun 18 09:52:31 2024
-
+* Last modification (input data): Tue Sep 24 17:20:08 2024
 * 
 *###################### R SECTION END (VERSION INFO) ###########################
 

modules/11_costs/default/equations.gms

@@ -40,7 +40,7 @@
                    + sum(cell(i2,j2), vm_cost_cropland(j2))
                    + sum(cell(i2,j2),vm_cost_bv_loss(j2))
                    + sum(cell(i2,j2),vm_cost_urban(j2))
-                   + sum(cell(i2,j2),vm_water_cost(i2))
+                   + vm_water_cost(i2)
 ;
 
 *' The total regional production cost calculation is based on the sum of different