diff --git a/config/config.default.yaml b/config/config.default.yaml index e4cb733ef0..0ae1ef16d7 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -1621,8 +1621,6 @@ cba: cba_scenario_input: use_presolved: false sb_version: latest - methods: - - toot projects: [] area: tyndp remove_noisy_costs: true diff --git a/config/config.tyndp.yaml b/config/config.tyndp.yaml index 5fe0e820e6..c7ab3b247e 100644 --- a/config/config.tyndp.yaml +++ b/config/config.tyndp.yaml @@ -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) diff --git a/config/schema.default.json b/config/schema.default.json index f42b05a74d..ab038d58ff 100644 --- a/config/schema.default.json +++ b/config/schema.default.json @@ -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": { @@ -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": { diff --git a/config/test/config.cyears.yaml b/config/test/config.cyears.yaml index b1174c4f5f..f7dabf4065 100644 --- a/config/test/config.cyears.yaml +++ b/config/test/config.cyears.yaml @@ -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) diff --git a/config/test/config.tyndp.yaml b/config/test/config.tyndp.yaml index 5107dd6203..e3707464f1 100644 --- a/config/test/config.tyndp.yaml +++ b/config/test/config.tyndp.yaml @@ -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) diff --git a/doc/release_notes.md b/doc/release_notes.md index c565fc1fc7..acbec9e282 100644 --- a/doc/release_notes.md +++ b/doc/release_notes.md @@ -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** diff --git a/doc/scenarios.md b/doc/scenarios.md index 8b7f084289..630bdd0077 100644 --- a/doc/scenarios.md +++ b/doc/scenarios.md @@ -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, diff --git a/scripts/lib/validation/config/cba.py b/scripts/lib/validation/config/cba.py index 5ee591f876..4998744222 100644 --- a/scripts/lib/validation/config/cba.py +++ b/scripts/lib/validation/config/cba.py @@ -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').",