Commit 2096c357 authored by Erkka Rinne's avatar Erkka Rinne
Browse files

Merge branch 'release/1.0.4'

parents 4b86df6f 3f55ead7
......@@ -3,10 +3,20 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
## [1.0.4] - 2019-02-11
### Fixed
- Severe bug in setting node state level limits
### Changed
- Suppress ouput from SCENRED2
## [1.0.3] - 2019-02-05
### Fixed
- Only selects forecasts with positive probability for the solve
## [1.0.2] - 2019-02-04
### Added
- New model setting `dataLength` to set the length of time series data before it is
......@@ -34,6 +44,9 @@ All notable changes to this project will be documented in this file.
### Changed
- Major updates to data structures etc.
[Unreleased]: https://gitlab.vtt.fi/backbone/backbone/compare/v1.0.3...dev
[Unreleased]: https://gitlab.vtt.fi/backbone/backbone/compare/v1.0.4...dev
[1.0.4]: https://gitlab.vtt.fi/backbone/backbone/compare/v1.0.3...v1.0.4
[1.0.3]: https://gitlab.vtt.fi/backbone/backbone/compare/v1.0.2...v1.0.3
[1.0.2]: https://gitlab.vtt.fi/backbone/backbone/compare/v1.0...v1.0.2
......@@ -370,7 +370,7 @@ $offtext
and msf(mSolve, s, f_solve)}
// Take average if not a limit type
= (sum(tt(t_), ts_node(grid, node, param_gnBoundaryTypes, f_solve, t_ + (dt_sampleOffset(grid, node, param_gnBoundaryTypes, s) + dt_circular(t_))))
/ mInterval(mSolve, 'stepsPerInterval', counter))$(not sameas(param_gnBoundaryTypes, 'upwardLimit') or sameas(param_gnBoundaryTypes, 'downwardLimit'))
/ mInterval(mSolve, 'stepsPerInterval', counter))$(not (sameas(param_gnBoundaryTypes, 'upwardLimit') or sameas(param_gnBoundaryTypes, 'downwardLimit')))
// Maximum lower limit
+ smax(tt(t_), ts_node(grid, node, param_gnBoundaryTypes, f_solve, t_ + (dt_sampleOffset(grid, node, param_gnBoundaryTypes, s) + dt_circular(t_))))
$sameas(param_gnBoundaryTypes, 'downwardLimit')
......
......@@ -17,11 +17,17 @@ ScenRedParms('visual_init') = 1;
ScenRedParms('visual_red') = 1;
$endif
* Data exchange and execute SCENRED2
* Export data
execute_unload 'srin.gdx', ScenRedParms,
s, ss, p_sProbability,
ts_influx_, ts_cf_;
execute 'scenred2 inc/scenred.cmd';
* Choose right null device
$ifthen %system.filesys% == 'MSNT' $set nuldev NUL
$else $set nuldev /dev/null
$endif
* Execute SCENRED2 and load data
put log "Executing SCENRED2"/; putclose log;
execute 'scenred2 inc/scenred.cmd > %nuldev%';
if(errorLevel, abort "Scenario reduction (SCENRED2) failed");
execute_load 'srout.gdx', ScenRedReport,
p_sProbability=red_prob;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment