doc updates

Docs/formulations.rst

@@ -1,7 +1,7 @@
 .. _formulations:
 
-Model Formulations and clustering
-=================================
+Model Formulations
+==================
 
 Because of the constraints linked to computational efficiency and to data availability, it is not necessarily desirable to accurately model each individual unit in the power system. For that reason, Dispa-SET can operate under different modelling hypotheses and levels of complexity. In terms of formulation of the optimization problem, these include for example:
 - A linear programming formulation, in which all units are clustered by technology 

Docs/implementation.rst

@@ -27,9 +27,7 @@ Each box in the flow chart corresponds to one data entity. The links between the
 	- Read csv sheets, assemble data
 	- Convert to the right format (timestep, units, etc).
 	- Define proper time index (duplicates not allowed)
-	- Connect to database
-	- Check if data present & write data
-	- Write metadata
+	- Write formatted input data to the Dispa-SET database
 2. Pre-processing:
 	- Read the config file
 	- Slice the data to the required time range
@@ -42,12 +40,9 @@ Each box in the flow chart corresponds to one data entity. The links between the
 	- Write the simulation environment to a user-defined folder
 3. Simulation environment and interoperability:
 	- Self-consistent folder with all required files to run the simulation:
-		- Excel files
 		- GDX file
 		- Input files in pickle format
 		- Gams model files
-	- Python scripts to translate the data between one format to the other.
-	- Possibility to modify the inputs manually and re-generate a GDX file from the excel files
 4. Simulation:
 	- The GAMS simulation file is run from the simulation environment folder
 	- All results and inputs are saved within the simulation environment
@@ -61,7 +56,7 @@ Each box in the flow chart corresponds to one data entity. The links between the
 Dispa-SET database
 ^^^^^^^^^^^^^^^^^^
 
-Although two versions of the database are available (mysql and csv), the public version of Dispa-SET only comes with the latter. The Dispa-SET input data is stored as csv file in directory structure. A link to the required data is then provided by the user in the configuration file.
+The public version of Dispa-SET is released with a Database relative to the EU power system. The Dispa-SET input data is stored as csv file in directory structure. A link to the required data is then provided by the user in the configuration file.
 
 .. image:: figures/database.png
 
@@ -95,46 +90,7 @@ UCM_h.gms is the main GAMS model described in Chapter 1. A copy of this file is
 	=============== =============================== =====================================
 
 UCM.gpr is the GAMS project file which should be opened before UCM_h.gms.
-
-make_gdx.gms
-------------
-
-GAMS file that reads the different template excel files and generates the Inputs.gdx file. This file should be opened in GAMS.
-
-.. table:: 
-
-	=============== =============================== =====================================
-	Requires: 	InputDispa-SET – xxx.xlsx	DispaSET template files
-	Generates:	Inputs.gdx			Input file for the simulation	
-	=============== =============================== =====================================
-
-
-makeGDX.bat
------------
-
-Batch script that generates the input file from the template without requiring opening GAMS. The first time it is executed, the path of the GAMS folder must be provided.
-
-.. table:: 
-
-	=============== =============================== =====================================
-	Requires: 	InputDispa-SET – xxx.xlsx	DispaSET template files
-	.		make_gdx.gms			GAMS file to generate Inputs.gdx
-	Generates:	Inputs.gdx			Input file for the simulation	
-	=============== =============================== =====================================
-
-
-writeresults.gms
-----------------
-
-GAMS file to generate the excel Results.xlsx file from the Results.gdx generated by GAMS (in case the write_excel function was deactivated in GAMS. 
-
-.. table:: 
-
-	=============== =============================== =====================================
-	Requires: 	Results.gdx			Simulation results in gdx format
-	Generates:	Results.xlsx			Simulation results in xlsx format	
-	=============== =============================== =====================================
-
+
 
 Inputs.gdx
 ----------
@@ -149,56 +105,6 @@ All the inputs of the model must be stored in the Inputs.gdx file since it is th
 	=============== =============================== =====================================
 
 
-InputDispa-SET -  [ParameterName].xlsx
---------------------------------------
-
-Series of 42 excel files, each corresponding to a parameter of the DispaSET model (see Chapter 1). The files must be formatted according to section 2.2.
-
-InputDispa-SET -  Sets.xlsx
----------------------------
-
-Single excel file that contains all the sets used in the model in a column format. 
-
-InputDispa-SET -  Config.xlsx
------------------------------
-
-Single excel file that contains simulation metadata in the form of a Table. This metadata allows setting the rolling horizon parameter and slicing the input data to simulate a subset only.
-
-.. table:: Config
-
-	=============================== ======= ======= ======= =================================================
-					Year	Month	Day	Description
-	=============================== ======= ======= ======= =================================================
-	FirstDay			2012	10	1	First day of the simulation in the template data
-	LastDay				2013	9	30	Last day of the simulation in the template data
-	RollingHorizon Length		0	0	3	Length of the rolling horizons 
-	RollingHorizon LookAhead	0	0	1	Overlap period of the rolling horizon 
-	=============================== ======= ======= ======= =================================================
-
-
-
-Structure of the Excel template
--------------------------------
-
-The name of the input files are "Input Dispa-SET – [Parameter name].xlsx". These files contain the data to be read by the model, after conversion into a GDX file. 
-
-The structure of all input files follows the following rules: 
-
-1. There is one file per model parameter 
-2. Each file contains only one sheet 
-3. The first row is left blank for non-time series data (i.e. data starts at A2)
-4. For time series data, the rows are organized as follows:
-	a. The first row is left blank
-	b. Rows 2 to 5 contains the year, month, day and hour of each data
-	c. Row 6 contains the time index of the data, which will be used in DispaSET
-	d. The data therefore starts at A6
-5. If one of the input sets of the data is u (the unit name), it is always defined as the first column of the data (column A)
-6. If one of the input sets of the data is h (the time index), it is always defined as the only horizontal input in row 6
-
-In the case of the file "Input Dispa-SET – Sets.xlsx", all the required sets are written in columns with the set name in row 2.
-
-
-
 Post-processing
 ^^^^^^^^^^^^^^^
 Post-processing is implemented in the form of a series of functions to read the simulation inputs and results, to plot them, and to derive statistics.

Docs/index.rst

@@ -6,7 +6,7 @@
 The Dispa-SET model
 ===================
 
-The Dispa-SET model is an open-source unit commitment and optimal dispatch model focused on the balancing and flexibility problems in European grids. Its pre and post-processing tools are written in Python and the main solver can be called via GAMS. The selected Mixed-Integer Linear Programming (MILP) solver is CPLEX.
+The Dispa-SET model is an open-source unit commitment and optimal dispatch model focused on the balancing and flexibility problems in European grids. Its pre and post-processing tools are written in Python and the main solver can be called via GAMS. 
 
 Dispa-SET is mainly developed within the Joint Research Centre of the EU Commission, in close collaboration with the University of Liège and the KU Leuven (Belgium).
 
@@ -54,10 +54,10 @@ Contents
    overview
    releases
    workflow
+   data
    model
    formulations
    implementation
-   data
    cases
    dispaset