Merge branch 'main' into revert_chgres_cube

ufs-community · Oct 8, 2024 · a4dbcdd · a4dbcdd
2 parents 6300771 + e2eb7fc
commit a4dbcdd
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git 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/...resources/jsonschema/execution.jsonschema → .../jsonschema/execution-parallel.jsonschema b/...resources/jsonschema/execution.jsonschema → .../jsonschema/execution-parallel.jsonschema
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: