From 2cf48190466f3b615f29a003c378fb9685fa71a9 Mon Sep 17 00:00:00 2001 From: Giacomo Capodaglio Date: Tue, 7 Nov 2023 16:53:35 -0800 Subject: [PATCH 1/4] Fixed issue with convert_culled_mesh_to_cdf5 For hurricane test case --- compass/ocean/tests/hurricane/configure.py | 1 + compass/ocean/tests/hurricane/hurricane.cfg | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 compass/ocean/tests/hurricane/hurricane.cfg diff --git a/compass/ocean/tests/hurricane/configure.py b/compass/ocean/tests/hurricane/configure.py index 4f0db8eff9..2a011be02e 100644 --- a/compass/ocean/tests/hurricane/configure.py +++ b/compass/ocean/tests/hurricane/configure.py @@ -17,6 +17,7 @@ def configure_hurricane(test_case, mesh): config = test_case.config config.add_from_package('compass.mesh', 'mesh.cfg') + config.add_from_package('compass.ocean.tests.hurricane', 'hurricane.cfg') config.add_from_package(mesh.package, mesh.mesh_config_filename, exception=True) diff --git a/compass/ocean/tests/hurricane/hurricane.cfg b/compass/ocean/tests/hurricane/hurricane.cfg new file mode 100644 index 0000000000..a1e74fb86b --- /dev/null +++ b/compass/ocean/tests/hurricane/hurricane.cfg @@ -0,0 +1,2 @@ +[spherical_mesh] +convert_culled_mesh_to_cdf5 = False From 0af800956013f24da42f8a12a88e8830d3430f85 Mon Sep 17 00:00:00 2001 From: Giacomo Capodaglio Date: Wed, 8 Nov 2023 06:55:22 -0800 Subject: [PATCH 2/4] Xylar's suggested changes --- compass/ocean/tests/hurricane/configure.py | 6 +++--- compass/ocean/tests/hurricane/hurricane.cfg | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/compass/ocean/tests/hurricane/configure.py b/compass/ocean/tests/hurricane/configure.py index 2a011be02e..d9bc592d83 100644 --- a/compass/ocean/tests/hurricane/configure.py +++ b/compass/ocean/tests/hurricane/configure.py @@ -1,6 +1,6 @@ -from compass.ocean.tests.global_ocean.metadata import \ - get_author_and_email_from_git - +from compass.ocean.tests.global_ocean.metadata import ( + get_author_and_email_from_git, +) def configure_hurricane(test_case, mesh): """ diff --git a/compass/ocean/tests/hurricane/hurricane.cfg b/compass/ocean/tests/hurricane/hurricane.cfg index a1e74fb86b..7c0d0ac0b2 100644 --- a/compass/ocean/tests/hurricane/hurricane.cfg +++ b/compass/ocean/tests/hurricane/hurricane.cfg @@ -1,2 +1,6 @@ +# options for spherical meshes [spherical_mesh] + +## config options related to the step for culling land from the mesh +# Whether to convert the culled mesh file to CDF5 format convert_culled_mesh_to_cdf5 = False From ce601b738f4a68d8c10c540a0f6310e0aa5cf9e7 Mon Sep 17 00:00:00 2001 From: Giacomo Capodaglio Date: Wed, 8 Nov 2023 07:01:33 -0800 Subject: [PATCH 3/4] Fixed flake8 comment --- compass/ocean/tests/hurricane/hurricane.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compass/ocean/tests/hurricane/hurricane.cfg b/compass/ocean/tests/hurricane/hurricane.cfg index 7c0d0ac0b2..7940fde3bc 100644 --- a/compass/ocean/tests/hurricane/hurricane.cfg +++ b/compass/ocean/tests/hurricane/hurricane.cfg @@ -1,6 +1,6 @@ # options for spherical meshes [spherical_mesh] -## config options related to the step for culling land from the mesh +# Config options related to the step for culling land from the mesh # Whether to convert the culled mesh file to CDF5 format convert_culled_mesh_to_cdf5 = False From 84bf76e5034692a6b30a2c9af1972105e14c46c8 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 8 Nov 2023 08:02:24 -0700 Subject: [PATCH 4/4] Fix linting --- compass/ocean/tests/hurricane/configure.py | 1 + 1 file changed, 1 insertion(+) diff --git a/compass/ocean/tests/hurricane/configure.py b/compass/ocean/tests/hurricane/configure.py index d9bc592d83..680b377b9f 100644 --- a/compass/ocean/tests/hurricane/configure.py +++ b/compass/ocean/tests/hurricane/configure.py @@ -2,6 +2,7 @@ get_author_and_email_from_git, ) + def configure_hurricane(test_case, mesh): """ Modify the configuration options for this test case