Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions config/config.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1621,8 +1621,6 @@ cba:
cba_scenario_input:
use_presolved: false
sb_version: latest
methods:
- toot
projects: []
area: tyndp
remove_noisy_costs: true
Expand Down
3 changes: 0 additions & 3 deletions config/config.tyndp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,6 @@ cba:
cba_scenario_input:
use_presolved: false
sb_version: latest # use 'latest' or a supported version from data/versions.csv for pre-solved SB network input in CBA; only applies if use_presolved is true
methods:
- toot
- pint
projects:
- t1-t35
area: tyndp # options: tyndp (TODO: entso-e, eu27)
Expand Down
22 changes: 0 additions & 22 deletions config/schema.default.json
Original file line number Diff line number Diff line change
Expand Up @@ -496,17 +496,6 @@
}
}
},
"methods": {
"description": "Methodologies to apply: 'toot' (take one out at a time) and 'pint' (put in one at a time).",
"items": {
"enum": [
"toot",
"pint"
],
"type": "string"
},
"type": "array"
},
"projects": {
"description": "List of project identifiers to evaluate (e.g., 't1-t35').",
"items": {
Expand Down Expand Up @@ -15689,17 +15678,6 @@
}
}
},
"methods": {
"description": "Methodologies to apply: 'toot' (take one out at a time) and 'pint' (put in one at a time).",
"items": {
"enum": [
"toot",
"pint"
],
"type": "string"
},
"type": "array"
},
"projects": {
"description": "List of project identifiers to evaluate (e.g., 't1-t35').",
"items": {
Expand Down
3 changes: 0 additions & 3 deletions config/test/config.cyears.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,6 @@ cba:
cba_scenario_input:
use_presolved: false
sb_version: latest # currently only latest is supported
methods:
- toot
- pint
projects:
- t1-t35
area: tyndp # options: tyndp (TODO: entso-e, eu27)
Expand Down
3 changes: 0 additions & 3 deletions config/test/config.tyndp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,6 @@ cba:
cba_scenario_input:
use_presolved: false
sb_version: latest # use 'latest' or a supported version from data/versions.csv for pre-solved SB network input in CBA; only applies if use_presolved is true
methods:
- toot
- pint
projects:
- t1-t35
area: tyndp # options: tyndp (TODO: entso-e, eu27)
Expand Down
1 change: 1 addition & 0 deletions doc/release_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

* Restore correct assigned countries for virtual TYNDP nodes ([#794](https://github.com/open-energy-transition/open-tyndp/pull/794)).

* Remove unused `cba.methods` config option ([#805](https://github.com/open-energy-transition/open-tyndp/pull/805)).

**Documentation**

Expand Down
2 changes: 1 addition & 1 deletion doc/scenarios.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ to form the two deviation scenarios are defined in `config/scenarios.tyndp.yaml`
| `solving` | Solver selection and option set (uses HiGHS by default). |
| `plotting` | Thresholds, map projection, balance map settings and factors. |
| `benchmarking` | Enables benchmarking. |
| `cba` | Cost-benefit analysis settings (hurdle costs, horizons, methods, projects, solver options). |
| `cba` | Cost-benefit analysis settings (hurdle costs, horizons, projects, solver options). |

The base config is `config.tyndp.yaml`. The scenario file `scenarios.tyndp.yaml` defines per-scenario override blocks (e.g., NT, DE, GA).
When a scenario is selected, its keys are merged onto the base config: matching keys override the base values,
Expand Down
4 changes: 0 additions & 4 deletions scripts/lib/validation/config/cba.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,6 @@ class CbaConfig(BaseModel):
default_factory=_CbaSbToCbaConfig,
description="Settings for using pre-solved SB networks as inputs to the CBA workflow.",
)
methods: list[Literal["toot", "pint"]] = Field(
default_factory=lambda: ["toot"],
description="Methodologies to apply: 'toot' (take one out at a time) and 'pint' (put in one at a time).",
)
projects: list[str] = Field(
default_factory=list,
description="List of project identifiers to evaluate (e.g., 't1-t35').",
Expand Down