Update refs to model.subset_time & run.objective (#602)

calliope-project · Jun 28, 2024 · 389653c · 389653c
1 parent 0f9f586
commit 389653c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docs/creating/scenarios.md b/docs/creating/scenarios.md
@@ -18,9 +18,9 @@ overrides:
   high_cost:
     techs.onshore_wind.cost_flow_cap.data: 2000
   year2005:
-    model.time_subset: ['2005-01-01', '2005-12-31']
+    init.time_subset: ['2005-01-01', '2005-12-31']
   year2006:
-    model.time_subset: ['2006-01-01', '2006-12-31']
+    init.time_subset: ['2006-01-01', '2006-12-31']
 
 config:
     ...

diff --git a/docs/running.md b/docs/running.md
@@ -60,7 +60,7 @@ Note that if both a scenario and an override with the same name exist (such as `
 It is also possible to use the `--override_dict` option to pass a YAML string that will be applied after anything applied through `--scenario`:
 
 ```shell
-$ calliope run testmodel/model.yaml --override_dict="{'model.time_subset': ['2005-01-01', '2005-01-31']}" --save_netcdf=results.nc
+$ calliope run testmodel/model.yaml --override_dict="{'init.time_subset': ['2005-01-01', '2005-01-31']}" --save_netcdf=results.nc
 ```
 
 ## Running in Python

diff --git a/src/calliope/config/math_schema.yaml b/src/calliope/config/math_schema.yaml
@@ -146,7 +146,7 @@ properties:
 
   objectives:
     type: object
-    description: Possible objectives to apply to the optimisation problem. Only one objective, the one referenced in model configuration `run.objective` will be activated for the optimisation problem.
+    description: Possible objectives to apply to the optimisation problem. Only one objective, the one referenced in model configuration `build.objective` will be activated for the optimisation problem.
     additionalProperties: false
     patternProperties:
       '[^\d^_\W][\w\d]+':

diff --git a/src/calliope/config/model_def_schema.yaml b/src/calliope/config/model_def_schema.yaml
@@ -82,7 +82,7 @@ $defs:
       Model dimension(s) over which the parameter is indexed.
       Must be same length as the sub-arrays of `index` (if `indexed` does not have any sub-arrays or is simply a single value, `dims` must be of length 1).
       Cannot include `techs` or `nodes` as these will be added automatically in preprocessing.
-      Must include `costs`run.objective
+      Must include `costs` as the string or as an element of the array.
     oneOf:
       - type: string
         enum: [costs]