Skip to content

Commit

Permalink
Merge pull request #352 from rl-institut/release/v0.3.0
Browse files Browse the repository at this point in the history
Release/v0.3.0
  • Loading branch information
smartie2076 authored Jun 8, 2020
2 parents 1aab3d5 + 9d1bc47 commit 5524d1d
Show file tree
Hide file tree
Showing 72 changed files with 4,297 additions and 2,213 deletions.
21 changes: 20 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,32 @@ Here is a template for new release sections
## [Unreleased]

### Added

-
### Changed
-
### Removed

## [0.3.0] - 2020-06-08

### Added
- Test for re-running a simulation with `json_input_processed.json` file (#343)

### Changed
- Test input files (#343)
- All parameters of the json/csv input files are now defined by constant variables (i.e, `CRATE="crate"` instead of string `"crate"`) (#346)
- Use "is" instead of "==" in if clauses for True, False and None (#346)
- Categorize constants in 'constants_json_strings.py' (#347)
- Renaming CAPEX_FIX = "capex_fix" into COST_DEVELOPMENT = "development_costs" (#347, #350)
- Renaming CAPEX_VAR = "capex_var" into SPECIFIC_COST = "specific_costs" (#347, #350)
- Renaming OPEX_FIX = "opex_fix" into SPECIFIC_COST_OM = "specific_costs_om" (#347, #350)
- Renaming OPEX_VAR = "opex_var" into PRICE_DISPATCH = "dispatch_price" (#347, #350)
- Change last strings into global constants in "constants_json_strings.py" (#349)
- Autoreport now refers to actual project and scenario name + ID (#349)

### Removed



## [0.2.1] - 2020-05-28

### Added
Expand Down
10 changes: 5 additions & 5 deletions docs/MVS_parameters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ Common Parameters in the CSV/JSON files and in energyConversion.csv:

**age_installed**: The number of years the asset has already been in operation

**capex_fix**: A fixed cost to implement the asset, eg. planning costs which do not depend on the (optimized) asset capacity (€)
**development_costs**: A fixed cost to implement the asset, eg. planning costs which do not depend on the (optimized) asset capacity (€)

**capex_var**: Actual CAPEX of the asset (€/kW), ie. specific investment costs
**specific_costs**: Actual CAPEX of the asset (€/kW), ie. specific investment costs

**efficiency**: Ratio of energy output/energy input

Expand All @@ -71,10 +71,10 @@ Common Parameters in the CSV/JSON files and in energyConversion.csv:

**lifetime**: Number of operational years of the asset until it has to be replaced

**opex_fix**: Specific annual OPEX of the asset (€/kW/year)
**cost_om**: Specific annual OPEX of the asset (€/kW/year)

**opex_var**: Variable cost associated with a flow through/from the asset (€/kWh). In "storage_xx.csv" only the columns "input power" and "output power"
require a value, in column "storage capacity" opex_var should be set to NaN.
**dispatch_price**: Variable cost associated with a flow through/from the asset (€/kWh). In "storage_xx.csv" only the columns "input power" and "output power"
require a value, in column "storage capacity" dispatch_price should be set to NaN.

**optimizeCap**: Permissible values are either True or False; ‘True’ if the user wants to perform capacity optimization for various components

Expand Down
4 changes: 2 additions & 2 deletions docs/simulating_with_the_mvs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ The feature was tested for following paramters:

- feedin_tariff

- opex_var
- dispatch_price

- efficiency

Expand Down Expand Up @@ -187,7 +187,7 @@ For that, you define one or muliple of the parameters within the list with the a
If you define an output- or input flow with with a list,
you also have to define related parameters as a list.
So, for example, if you define the input direction as a list for an energyConsumption asset,
you need to define the efficiencies and opex_var costs as a list as well.
you need to define the efficiencies and dispatch_price costs as a list as well.

You can see an implemented example here, where the heat pump has a time-dependent efficiency:

Expand Down
8 changes: 4 additions & 4 deletions docs/tables/example_multiple_inputs_energyConversion.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
,unit,electrolyser
age_installed,year,3
capex_fix,currency,0
capex_var,currency/kW,1500
development_costs,currency,0
specific_costs,currency/kW,1500
efficiency,factor,"[0.01923,0.28845]"
inflow_direction,str,"[MicroGrid,Water]"
installedCap,kW,0
label,str,Electrolyser
lifetime,year,20
opex_fix,currency/kW/year,75
opex_var,currency/kWh,"[0,0.0038]"
specific_costs_om,currency/kW/year,75
dispatch_price,currency/kWh,"[0,0.0038]"
optimizeCap,bool,True
outflow_direction,str,Local H2 grid
energyVector,str,Electricity
Expand Down
8 changes: 4 additions & 4 deletions docs/tables/example_scalar_as_timeseries_energyConversion.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
,unit,heat_pump
age_installed,year,0
capex_fix,currency,0
capex_var,currency/kW,7000
development_costs,currency,0
specific_costs,currency/kW,7000
efficiency,factor,"{'value': {'file_name': 'cops_eers_test.csv', 'header': 'no_unit'}, 'unit': ''}"
inflow_direction,str,Electricity
installedCap,kW,0
label,str,Heat pump
lifetime,year,20
opex_fix,currency/kW/year,0
opex_var,currency/kWh,0
specific_costs_om,currency/kW/year,0
dispatch_price,currency/kWh,0
optimizeCap,bool,True
outflow_direction,str,Heat
energyVector,str,Electricity
Expand Down
8 changes: 4 additions & 4 deletions inputs/csv_elements/energyConversion.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
,unit,storage_charge_controller_in,storage_charge_controller_out,solar_inverter_01,transformer_station_in,transformer_station_out
age_installed,year,0.0,0.0,0,5,5
capex_fix,currency,0.0,0.0,0.0,0.0,0.0
capex_var,currency/kW,0.0,0.0,3000,0.0,0.0
development_costs,currency,0.0,0.0,0.0,0.0,0.0
specific_costs,currency/kW,0.0,0.0,3000,0.0,0.0
efficiency,factor,1,1,1.0,0.96,0.96
inflow_direction,str,Electricity,ESS Li-Ion,PV plant (mono),Electricity (DSO),Electricity
installedCap,kW,0.0,0.0,0.0,1250,1250
label,str,Charge Contoller ESS Li-Ion (charge),Charge Contoller ESS Li-Ion (discharge),Solar inverter (mono),Transformer station (DSO) consumption,Transformer station (DSO) feedin
lifetime,year,10,10,15,30,30
opex_fix,currency/kW/year,0.0,0.0,0.0,0.0,0.0
opex_var,currency/kWh,0.0,0.0,0.0,0.0,0.0
specific_costs_om,currency/kW/year,0.0,0.0,0.0,0.0,0.0
dispatch_price,currency/kWh,0.0,0.0,0.0,0.0,0.0
optimizeCap,bool,True,True,True,False,False
outflow_direction,str,ESS Li-Ion,Electricity,Electricity,Electricity,Electricity (DSO)
energyVector,str,Electricity,Electricity,Electricity,Electricity,Electricity
Expand Down
8 changes: 4 additions & 4 deletions inputs/csv_elements/energyProduction.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
,unit,pv_plant_01
age_installed,year,0
capex_fix,currency,10000
capex_var,currency/unit,7200
development_costs,currency,10000
specific_costs,currency/unit,7200
file_name,str,pv_gen_merra2_2014_eff1_tilt40_az180.csv
installedCap,kWp,1500
maximumCap, kWp,None
label,str,PV plant (mono)
lifetime,year,30
opex_fix,currency/unit/year,80
opex_var,currency/kWh,0
specific_costs_om,currency/unit/year,80
dispatch_price,currency/kWh,0
optimizeCap,bool,True
outflow_direction,str,PV plant (mono)
type_oemof,str,source
Expand Down
8 changes: 4 additions & 4 deletions inputs/csv_elements/fixcost.csv
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
,unit,distribution_grid,engineering,operation
age_installed,year,10, 0, 0
capex_fix,currency,0.0,0,0
capex_var,currency,0.0,0,0
development_costs,currency,0.0,0,0
specific_costs,currency,0.0,0,0
label,str,distribution grid infrastructure,"R&D, engineering",Fix project operation
lifetime,year,30,20,20
opex_fix,currency/year,0,0,4600
opex_var,currency/kWh,0,0,0
specific_costs_om,currency/year,0,0,4600
dispatch_price,currency/kWh,0,0,0
8 changes: 4 additions & 4 deletions inputs/csv_elements/storage_01.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
,unit,storage capacity,input power,output power
age_installed,year,0,0,0
capex_fix,currency,0,0,0
capex_var,currency/unit,4000,0,0
development_costs,currency,0,0,0
specific_costs,currency/unit,4000,0,0
c_rate,factor of total capacity (kWh),NA,1,1
efficiency,factor,0,0.95,0.95
installedCap,unit,0,0,0
label,str,storage capacity,input power,output power
lifetime,year,10,10,10
opex_fix,currency/unit/year,0,0,0
opex_var,currency/kWh,NA,0,0
specific_costs_om,currency/unit/year,0,0,0
dispatch_price,currency/kWh,NA,0,0
soc_initial,None or factor,None,NA,NA
soc_max,factor,1,NA,NA
soc_min,factor,0.2,NA,NA
Expand Down
Loading

0 comments on commit 5524d1d

Please sign in to comment.