diff --git a/src/uwtools/resources/jsonschema/chgres-cube.jsonschema b/src/uwtools/resources/jsonschema/chgres-cube.jsonschema index 380f57023..ff7668022 100644 --- a/src/uwtools/resources/jsonschema/chgres-cube.jsonschema +++ b/src/uwtools/resources/jsonschema/chgres-cube.jsonschema @@ -4,7 +4,7 @@ "additionalProperties": false, "properties": { "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "namelist": { "additionalProperties": false, diff --git a/src/uwtools/resources/jsonschema/execution.jsonschema b/src/uwtools/resources/jsonschema/execution-parallel.jsonschema similarity index 100% rename from src/uwtools/resources/jsonschema/execution.jsonschema rename to src/uwtools/resources/jsonschema/execution-parallel.jsonschema diff --git a/src/uwtools/resources/jsonschema/fv3.jsonschema b/src/uwtools/resources/jsonschema/fv3.jsonschema index a1f8a759a..49fbc6125 100644 --- a/src/uwtools/resources/jsonschema/fv3.jsonschema +++ b/src/uwtools/resources/jsonschema/fv3.jsonschema @@ -30,7 +30,7 @@ "type": "string" }, "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "field_table": { "additionalProperties": false, diff --git a/src/uwtools/resources/jsonschema/jedi.jsonschema b/src/uwtools/resources/jsonschema/jedi.jsonschema index 44364a411..6b90969b2 100644 --- a/src/uwtools/resources/jsonschema/jedi.jsonschema +++ b/src/uwtools/resources/jsonschema/jedi.jsonschema @@ -29,7 +29,7 @@ "type": "object" }, "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "files_to_copy": { "$ref": "urn:uwtools:files-to-stage" diff --git a/src/uwtools/resources/jsonschema/mpas-init.jsonschema b/src/uwtools/resources/jsonschema/mpas-init.jsonschema index a56ecf5b2..0b20bdf61 100644 --- a/src/uwtools/resources/jsonschema/mpas-init.jsonschema +++ b/src/uwtools/resources/jsonschema/mpas-init.jsonschema @@ -31,7 +31,7 @@ "type": "object" }, "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "files_to_copy": { "$ref": "urn:uwtools:files-to-stage" diff --git a/src/uwtools/resources/jsonschema/mpas.jsonschema b/src/uwtools/resources/jsonschema/mpas.jsonschema index f6c0005c9..b3aabb4f2 100644 --- a/src/uwtools/resources/jsonschema/mpas.jsonschema +++ b/src/uwtools/resources/jsonschema/mpas.jsonschema @@ -4,7 +4,7 @@ "additionalProperties": false, "properties": { "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "files_to_copy": { "$ref": "urn:uwtools:files-to-stage" diff --git a/src/uwtools/resources/jsonschema/orog.jsonschema b/src/uwtools/resources/jsonschema/orog.jsonschema index 6474b0445..e43b67c17 100644 --- a/src/uwtools/resources/jsonschema/orog.jsonschema +++ b/src/uwtools/resources/jsonschema/orog.jsonschema @@ -4,7 +4,7 @@ "additionalProperties": false, "properties": { "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "files_to_link": { "$ref": "urn:uwtools:files-to-stage" diff --git a/src/uwtools/resources/jsonschema/sfc-climo-gen.jsonschema b/src/uwtools/resources/jsonschema/sfc-climo-gen.jsonschema index d4207bac8..220454615 100644 --- a/src/uwtools/resources/jsonschema/sfc-climo-gen.jsonschema +++ b/src/uwtools/resources/jsonschema/sfc-climo-gen.jsonschema @@ -4,7 +4,7 @@ "additionalProperties": false, "properties": { "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "namelist": { "additionalProperties": false, diff --git a/src/uwtools/resources/jsonschema/ungrib.jsonschema b/src/uwtools/resources/jsonschema/ungrib.jsonschema index e938b5d48..9ba6bc36c 100644 --- a/src/uwtools/resources/jsonschema/ungrib.jsonschema +++ b/src/uwtools/resources/jsonschema/ungrib.jsonschema @@ -4,7 +4,7 @@ "additionalProperties": false, "properties": { "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "gfs_files": { "additionalProperties": false, diff --git a/src/uwtools/resources/jsonschema/upp.jsonschema b/src/uwtools/resources/jsonschema/upp.jsonschema index 1ca647919..ff2ea2a67 100644 --- a/src/uwtools/resources/jsonschema/upp.jsonschema +++ b/src/uwtools/resources/jsonschema/upp.jsonschema @@ -4,7 +4,7 @@ "additionalProperties": false, "properties": { "execution": { - "$ref": "urn:uwtools:execution" + "$ref": "urn:uwtools:execution-parallel" }, "files_to_copy": { "$ref": "urn:uwtools:files-to-stage" diff --git a/src/uwtools/tests/test_schemas.py b/src/uwtools/tests/test_schemas.py index 678055b6f..95f10bdb6 100644 --- a/src/uwtools/tests/test_schemas.py +++ b/src/uwtools/tests/test_schemas.py @@ -667,15 +667,15 @@ def test_schema_esg_grid_rundir(esg_grid_prop): assert "42 is not of type 'string'\n" in errors(42) -# execution +# execution-parallel -def test_schema_execution(): +def test_schema_parallel_execution(): config = {"executable": "fv3"} batchargs = {"batchargs": {"queue": "string", "walltime": "string"}} mpiargs = {"mpiargs": ["--flag1", "--flag2"]} threads = {"threads": 32} - errors = schema_validator("execution") + errors = schema_validator("execution-parallel") # Basic correctness: assert not errors(config) # batchargs may optionally be specified: @@ -692,16 +692,16 @@ def test_schema_execution(): ) -def test_schema_execution_executable(): - errors = schema_validator("execution", "properties", "executable") +def test_schema_parallel_execution_executable(): + errors = schema_validator("execution-parallel", "properties", "executable") # String value is ok: assert not errors("fv3.exe") # Anything else is not: assert "42 is not of type 'string'\n" in errors(42) -def test_schema_execution_mpiargs(): - errors = schema_validator("execution", "properties", "mpiargs") +def test_schema_parallel_execution_mpiargs(): + errors = schema_validator("execution-parallel", "properties", "mpiargs") # Basic correctness: assert not errors(["string1", "string2"]) # mpiargs may be empty: @@ -710,8 +710,8 @@ def test_schema_execution_mpiargs(): assert "42 is not of type 'string'\n" in errors(["string1", 42]) -def test_schema_execution_threads(): - errors = schema_validator("execution", "properties", "threads") +def test_schema_parallel_execution_threads(): + errors = schema_validator("execution-parallel", "properties", "threads") # threads must be non-negative, and an integer: assert not errors(1) assert not errors(4) @@ -725,7 +725,7 @@ def test_schema_execution_threads(): def test_schema_execution_serial(): config = {"executable": "fv3"} batchargs = {"batchargs": {"queue": "string", "walltime": "string"}} - errors = schema_validator("execution") + errors = schema_validator("execution-serial") # Basic correctness: assert not errors(config) # batchargs may optionally be specified: