From 97db95b22fae912bc9fed05294276f43d338401c Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Mon, 19 Aug 2024 14:16:36 +0200 Subject: [PATCH 1/6] Restructure testlist_blom.xml file --- cime_config/testdefs/testlist_blom.xml | 41 ++++++++++++++----- .../{blom => hamocc}/hamocc1/shell_commands | 0 .../{blom => hamocc}/hamocc1/user_nl_blom | 0 .../{blom => hamocc}/hamocc2/shell_commands | 0 .../{blom => hamocc}/hamocc2/user_nl_blom | 0 5 files changed, 31 insertions(+), 10 deletions(-) rename cime_config/testdefs/testmods_dirs/{blom => hamocc}/hamocc1/shell_commands (100%) rename cime_config/testdefs/testmods_dirs/{blom => hamocc}/hamocc1/user_nl_blom (100%) rename cime_config/testdefs/testmods_dirs/{blom => hamocc}/hamocc2/shell_commands (100%) rename cime_config/testdefs/testmods_dirs/{blom => hamocc}/hamocc2/user_nl_blom (100%) diff --git a/cime_config/testdefs/testlist_blom.xml b/cime_config/testdefs/testlist_blom.xml index e1426bba..486aad7c 100644 --- a/cime_config/testdefs/testlist_blom.xml +++ b/cime_config/testdefs/testlist_blom.xml @@ -1,38 +1,59 @@ + + + + + + + + + - - - - - - + + + + + + + + + - + + - + + + + + - + - + + + + + diff --git a/cime_config/testdefs/testmods_dirs/blom/hamocc1/shell_commands b/cime_config/testdefs/testmods_dirs/hamocc/hamocc1/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/blom/hamocc1/shell_commands rename to cime_config/testdefs/testmods_dirs/hamocc/hamocc1/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/blom/hamocc1/user_nl_blom b/cime_config/testdefs/testmods_dirs/hamocc/hamocc1/user_nl_blom similarity index 100% rename from cime_config/testdefs/testmods_dirs/blom/hamocc1/user_nl_blom rename to cime_config/testdefs/testmods_dirs/hamocc/hamocc1/user_nl_blom diff --git a/cime_config/testdefs/testmods_dirs/blom/hamocc2/shell_commands b/cime_config/testdefs/testmods_dirs/hamocc/hamocc2/shell_commands similarity index 100% rename from cime_config/testdefs/testmods_dirs/blom/hamocc2/shell_commands rename to cime_config/testdefs/testmods_dirs/hamocc/hamocc2/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/blom/hamocc2/user_nl_blom b/cime_config/testdefs/testmods_dirs/hamocc/hamocc2/user_nl_blom similarity index 100% rename from cime_config/testdefs/testmods_dirs/blom/hamocc2/user_nl_blom rename to cime_config/testdefs/testmods_dirs/hamocc/hamocc2/user_nl_blom From 5379eb147fca9be4071bbe54d4922a854ec5180b Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Mon, 19 Aug 2024 14:20:11 +0200 Subject: [PATCH 2/6] Add settings for hybrid coordinates --- .../testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands b/cime_config/testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands new file mode 100644 index 00000000..0a44a1b4 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands @@ -0,0 +1,2 @@ +./xmlchange BLOM_TURBULENT_CLOSURE= +./xmlchange BLOM_VCOORD=cntiso_hybrid From fb23cb2d397a7fc4071405df7dc805b6cb956cad Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Mon, 19 Aug 2024 23:08:47 +0200 Subject: [PATCH 3/6] Update test comment --- cime_config/testdefs/testlist_blom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_blom.xml b/cime_config/testdefs/testlist_blom.xml index 486aad7c..4d908a9b 100644 --- a/cime_config/testdefs/testlist_blom.xml +++ b/cime_config/testdefs/testlist_blom.xml @@ -34,7 +34,7 @@ - + From 7b808cbfba1652ea7462fe61d7f68be9c553fddd Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Mon, 19 Aug 2024 23:30:43 +0200 Subject: [PATCH 4/6] Fix typo --- cime_config/testdefs/testlist_blom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_blom.xml b/cime_config/testdefs/testlist_blom.xml index 4d908a9b..924252d8 100644 --- a/cime_config/testdefs/testlist_blom.xml +++ b/cime_config/testdefs/testlist_blom.xml @@ -38,7 +38,7 @@ - + From 59e1d9110921fd11474290a5f13360ebbcbb7e8e Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Tue, 20 Aug 2024 10:24:13 +0200 Subject: [PATCH 5/6] Replace hybrid with isopycninc coordinates in ERR test --- cime_config/testdefs/testlist_blom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_blom.xml b/cime_config/testdefs/testlist_blom.xml index 924252d8..ba446e17 100644 --- a/cime_config/testdefs/testlist_blom.xml +++ b/cime_config/testdefs/testlist_blom.xml @@ -19,13 +19,13 @@ - + - + From d2119d153dad113b010909a787610a3ead87e206 Mon Sep 17 00:00:00 2001 From: Tomas Torsvik Date: Wed, 21 Aug 2024 09:46:04 +0200 Subject: [PATCH 6/6] Remove unused testdefs hybrid_hamocc --- .../testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands b/cime_config/testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands deleted file mode 100644 index 0a44a1b4..00000000 --- a/cime_config/testdefs/testmods_dirs/blom/hybrid_hammocc/shell_commands +++ /dev/null @@ -1,2 +0,0 @@ -./xmlchange BLOM_TURBULENT_CLOSURE= -./xmlchange BLOM_VCOORD=cntiso_hybrid