Merge pull request #80 from HauHe/hauke/no_rounding_new_cap

Hauke/no rounding new cap

README.md

@@ -92,6 +92,8 @@ about allowing investment in coal.
 Drop in an osemsosys file (called `osemosys.txt`) into the `model/` directory
 
 ## 2. Add the base data file
+**NB:** Neither the model data nor the scenario data should make use of the parameter _TotalAnnualMaxCapacity_. It can cause problems when passing _NewCapacity_ from one step to the next step.
+
 Drop in a MathProg formatted data file in the `data/` folder. The data file 
 can be long formatted (otoole) or wide formatted (momani)
 

src/main.py

@@ -510,9 +510,6 @@ def main(input_data: str, step_length: int, path_param: str, cores: int, solver=
 
             op_life = pd.read_csv(str(Path(step_dir_data, "OperationalLife.csv")))
             new_cap = pd.read_csv(str(Path(step_dir_results, "NewCapacity.csv")))
-            new_cap["VALUE"] =  new_cap["VALUE"] * 10
-            new_cap['VALUE'] = new_cap['VALUE'].apply(np.floor)
-            new_cap['VALUE'] = new_cap['VALUE'] / 10
 
             res_cap = mu.update_res_capacity(
                 res_capacity=old_res_cap,
@@ -555,9 +552,6 @@ def main(input_data: str, step_length: int, path_param: str, cores: int, solver=
             # Get updated residual capacity values 
             op_life = pd.read_csv(str(Path(option_dir_data, "OperationalLife.csv")))
             new_cap = pd.read_csv(str(Path(option_dir_results, "NewCapacity.csv")))
-            new_cap["VALUE"] =  new_cap["VALUE"] * 10
-            new_cap['VALUE'] = new_cap['VALUE'].apply(np.floor)
-            new_cap['VALUE'] = new_cap['VALUE'] / 10
 
             # overwrite residual capacity values for all subsequent steps
             next_step = step + 1
@@ -600,9 +594,6 @@ def main(input_data: str, step_length: int, path_param: str, cores: int, solver=
 
                 op_life = pd.read_csv(str(Path(option_dir_data, "OperationalLife.csv")))
                 new_cap = pd.read_csv(str(Path(option_dir_results, "NewCapacity.csv")))
-                new_cap["VALUE"] =  new_cap["VALUE"] * 10
-                new_cap['VALUE'] = new_cap['VALUE'].apply(np.floor)
-                new_cap['VALUE'] = new_cap['VALUE'] / 10
 
                 # overwrite residual capacity values for all subsequent steps
                 next_step = step + 1