From fe47f8bc36febd2da4ee365106d31e2c8e268624 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 12 Oct 2023 13:57:40 +0200 Subject: [PATCH 01/45] updated Externals to point to new branch --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index c21944b..1458a96 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,9 @@ [ww3dev] -tag = ww3_noresm0.0.7 +#tag = ww3_noresm0.0.7 +branch = feature/new_flds_to_cmeps protocol = git -repo_url = https://github.com/NorESMhub/WW3.git +#repo_url = https://github.com/NorESMhub/WW3.git +repo_url = https://github.com/mvertens/WW3.git local_path = WW3 required = True From 650d4c881a29dbfc63ade85250a12ed4ee44ca67 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 31 Oct 2023 09:57:48 +0100 Subject: [PATCH 02/45] pointing to new version of WW3 --- Externals.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 1458a96..50a4a99 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,9 +1,7 @@ [ww3dev] -#tag = ww3_noresm0.0.7 -branch = feature/new_flds_to_cmeps +tag = ww3_noresm0.0.8 protocol = git -#repo_url = https://github.com/NorESMhub/WW3.git -repo_url = https://github.com/mvertens/WW3.git +repo_url = https://github.com/NorESMhub/WW3.git local_path = WW3 required = True From 25c19114aa9b1f088e6be84767980d4c62fc20fb Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Mon, 4 Dec 2023 19:53:57 +0100 Subject: [PATCH 03/45] pointing to ww3dev branch in PR --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 50a4a99..940400d 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,9 @@ [ww3dev] -tag = ww3_noresm0.0.8 +#tag = ww3_noresm0.0.8 +branch = feature/averaging_for_partitions protocol = git -repo_url = https://github.com/NorESMhub/WW3.git +#repo_url = https://github.com/NorESMhub/WW3.git +repo_url = https://github.com/mvertens/WW3.git local_path = WW3 required = True From 59869c4f16d315936a5d53df55e5f7aec2fbfae7 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Fri, 8 Dec 2023 12:19:58 +0100 Subject: [PATCH 04/45] changes needed for new WW3 merge for daily averaging of fields sent to mediator for history output --- Externals.cfg | 6 ++---- cime_config/namelist_definition_ww3.xml | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 940400d..8e58b3f 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,9 +1,7 @@ [ww3dev] -#tag = ww3_noresm0.0.8 -branch = feature/averaging_for_partitions +tag = ww3_noresm0.0.9 protocol = git -#repo_url = https://github.com/NorESMhub/WW3.git -repo_url = https://github.com/mvertens/WW3.git +repo_url = https://github.com/NorESMhub/WW3.git local_path = WW3 required = True diff --git a/cime_config/namelist_definition_ww3.xml b/cime_config/namelist_definition_ww3.xml index bce7be2..e0b25c1 100644 --- a/cime_config/namelist_definition_ww3.xml +++ b/cime_config/namelist_definition_ww3.xml @@ -299,9 +299,10 @@ output_type_nml setup - WND ICE HS T02 T0M1 T01 FP DIR EF USS TOC + WND ICE HS T02 T0M1 T01 FP DP DIR EF USS TOC PHS PDIR PT01 PTM10 + char output_type_nml From e6e48fbbc3d8b11be9441e508e385e5003ff5ad6 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Wed, 10 Jan 2024 14:23:27 +0100 Subject: [PATCH 05/45] updated externals to pass 10m wind to atm --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 8e58b3f..687cb16 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,9 @@ [ww3dev] -tag = ww3_noresm0.0.9 +#tag = ww3_noresm0.0.9 +branch = feature/pass_10mwind_to_ww3 protocol = git -repo_url = https://github.com/NorESMhub/WW3.git +#repo_url = https://github.com/NorESMhub/WW3.git +repo_url = https://github.com/mvertens/WW3.git local_path = WW3 required = True From 557ffeee3579c2655e2df81b15a6a8c5bcaaaab6 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 20 Feb 2024 11:43:50 +0100 Subject: [PATCH 06/45] fixed typo --- cime_config/config_component.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index dd6bf77..0030a1d 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -50,7 +50,7 @@ case_comp env_build.xml mod_def file to use. The value depends on the switches, if you have an unstructured mesh and the - wave propoagation scheme. Note that this file is renamed to mod_def.ww3 in the run directory. + wave propagation scheme. Note that this file is renamed to mod_def.ww3 in the run directory. From f615c6cb6398d9987d66c7cd64b03c45fdee9266 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 27 Feb 2024 10:49:53 +0100 Subject: [PATCH 07/45] update Externals.cfg to point to new tagged ww3 --- Externals.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 687cb16..eb54987 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,9 +1,7 @@ [ww3dev] -#tag = ww3_noresm0.0.9 -branch = feature/pass_10mwind_to_ww3 protocol = git -#repo_url = https://github.com/NorESMhub/WW3.git -repo_url = https://github.com/mvertens/WW3.git +tag = ww3_noresm0.0.10 +repo_url = https://github.com/NorESMhub/WW3.git local_path = WW3 required = True From 51c8cd371059e85d04a5c09712bde271d273aaca Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 25 Jul 2024 11:00:07 +0200 Subject: [PATCH 08/45] moved ww3dev to ww3 --- Externals.cfg | 2 +- cime_config/buildnml | 12 ++--- cime_config/config_archive.xml | 2 +- cime_config/config_component.xml | 6 +-- cime_config/config_compsets.xml | 8 ++-- cime_config/config_pes.xml | 48 +++++++++---------- .../{testlist_ww3dev.xml => testlist_ww3.xml} | 12 ++--- cime_config/{user_nl_ww3dev => user_nl_ww3} | 0 8 files changed, 45 insertions(+), 45 deletions(-) rename cime_config/testdefs/{testlist_ww3dev.xml => testlist_ww3.xml} (71%) rename cime_config/{user_nl_ww3dev => user_nl_ww3} (100%) diff --git a/Externals.cfg b/Externals.cfg index eb54987..501731f 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,4 +1,4 @@ -[ww3dev] +[ww3] protocol = git tag = ww3_noresm0.0.10 repo_url = https://github.com/NorESMhub/WW3.git diff --git a/cime_config/buildnml b/cime_config/buildnml index 58f6a64..683f696 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -65,7 +65,7 @@ def _create_namelists(case, confdir, namelist_infile, nmlgen, data_list_path): else: nmlgen.add_default("initfile") - # error check + # error check dtcpl = basedt / int(ncpl) dtmax = int(float(nmlgen.get_value('dtmax'))) if dtcpl%dtmax != 0: @@ -84,8 +84,8 @@ def _create_namelists(case, confdir, namelist_infile, nmlgen, data_list_path): logger.debug("ww3 initial conditions file is %s", nmlgen.get_value("initfile")) namelist_file = os.path.join(confdir, "wav_in") - nmlgen.write_output_file(namelist_file, data_list_path, - groups=["domain_nml","input_nml","output_type_nml","output_date_nml","ww3_inparm"], + nmlgen.write_output_file(namelist_file, data_list_path, + groups=["domain_nml","input_nml","output_type_nml","output_date_nml","ww3_inparm"], sorted_groups=False) from pathlib import Path @@ -114,12 +114,12 @@ def buildnml(case, caseroot, compname): # Construct the namelist generator #---------------------------------------------------- # determine directory for user modified namelist_definitions.xml and namelist_defaults.xml - user_xml_dir = os.path.join(caseroot, "SourceMods", "src.ww3dev") + user_xml_dir = os.path.join(caseroot, "SourceMods", "src.ww3") expect(os.path.isdir(user_xml_dir), "user_xml_dir %s does not exist " %user_xml_dir) # user definition *replaces* existing definition. - namelist_xml_dir = os.path.join(srcroot, "components", "ww3dev", "cime_config") + namelist_xml_dir = os.path.join(srcroot, "components", "ww3", "cime_config") definition_file = [os.path.join(namelist_xml_dir, "namelist_definition_ww3.xml")] user_definition = os.path.join(user_xml_dir, "namelist_definition_ww3.xml") if os.path.isfile(user_definition): @@ -160,7 +160,7 @@ def buildnml(case, caseroot, compname): inst_string_label = "\"\"" # create namelist_infile using user_nl_file as input - user_nl_file = os.path.join(caseroot, "user_nl_ww3dev" + inst_string) + user_nl_file = os.path.join(caseroot, "user_nl_ww3" + inst_string) expect(os.path.isfile(user_nl_file), "Missing required user_nl_file %s " %(user_nl_file)) infile = os.path.join(confdir, "namelist_infile") diff --git a/cime_config/config_archive.xml b/cime_config/config_archive.xml index bc09726..ff56e57 100644 --- a/cime_config/config_archive.xml +++ b/cime_config/config_archive.xml @@ -1,6 +1,6 @@ - + r hi.*\.nc$ unset diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 0030a1d..700a560 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -3,13 +3,13 @@ - Wave Watch + Wave Watch char - ww3dev - ww3dev + ww3 + ww3 case_comp env_case.xml Name of wave component diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index b208f62..1990581 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -4,16 +4,16 @@ Each compset node is associated with the following elements - - lname - - alias + - lname + - alias - support (optional description of the support level for this compset) Each compset node can also have the following attributes - grid (optional regular expression match for grid to work with the compset) - WW3test - 2000_DATM%NYF_SLND_SICE_SOCN_SROF_SGLC_WW3DEV + WW3test + 2000_DATM%NYF_SLND_SICE_SOCN_SROF_SGLC_WW3 diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 49a1c6b..a6b69e7 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -4,37 +4,37 @@ - + none - 256 - 256 - 256 - 256 - 256 + 256 + 256 + 256 + 256 + 256 256 - 256 - 256 + 256 + 256 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 diff --git a/cime_config/testdefs/testlist_ww3dev.xml b/cime_config/testdefs/testlist_ww3.xml similarity index 71% rename from cime_config/testdefs/testlist_ww3dev.xml rename to cime_config/testdefs/testlist_ww3.xml index 2a22b19..034549b 100644 --- a/cime_config/testdefs/testlist_ww3dev.xml +++ b/cime_config/testdefs/testlist_ww3.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/cime_config/user_nl_ww3dev b/cime_config/user_nl_ww3 similarity index 100% rename from cime_config/user_nl_ww3dev rename to cime_config/user_nl_ww3 From 58fe77ce260421a1999746c116796a7172577562 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 25 Jul 2024 11:02:50 +0200 Subject: [PATCH 09/45] updated Externals.cfg to point to wave attenation and change of ww3dev to ww3 --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 501731f..6ba4ecc 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,9 @@ [ww3] protocol = git -tag = ww3_noresm0.0.10 -repo_url = https://github.com/NorESMhub/WW3.git +#tag = ww3_noresm0.0.10 +#repo_url = https://github.com/NorESMhub/WW3.git +branch = 78a66d5c +repo_url = https://github.com/mvertens/WW3.git local_path = WW3 required = True From 60d7a3b946bad97c38204713295e76b610135465 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 25 Jul 2024 11:44:39 +0200 Subject: [PATCH 10/45] always receive Si_thick from mediator --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 6ba4ecc..1c11287 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -2,7 +2,7 @@ protocol = git #tag = ww3_noresm0.0.10 #repo_url = https://github.com/NorESMhub/WW3.git -branch = 78a66d5c +branch = 73aad054 repo_url = https://github.com/mvertens/WW3.git local_path = WW3 required = True From e4bdd0522ff3691cbd044ef5d3c8a243156be121 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 25 Jul 2024 12:29:57 +0200 Subject: [PATCH 11/45] fixed Externals.cfg --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 1c11287..db04f9b 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -2,7 +2,7 @@ protocol = git #tag = ww3_noresm0.0.10 #repo_url = https://github.com/NorESMhub/WW3.git -branch = 73aad054 +tag = 73aad054 repo_url = https://github.com/mvertens/WW3.git local_path = WW3 required = True From 51837efc6dd9530a685beb19f6371c16a208b7f4 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 25 Jul 2024 14:45:58 +0200 Subject: [PATCH 12/45] fix compilation problem in WW3 --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index db04f9b..2f99572 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -2,7 +2,7 @@ protocol = git #tag = ww3_noresm0.0.10 #repo_url = https://github.com/NorESMhub/WW3.git -tag = 73aad054 +tag = 532fb765 repo_url = https://github.com/mvertens/WW3.git local_path = WW3 required = True From 61bb194d48561e6b02fb63f3829a66ffef63a2fb Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Wed, 21 Aug 2024 09:02:36 +0200 Subject: [PATCH 13/45] updated WW3 external --- Externals.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 2f99572..6cba079 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,9 +1,7 @@ [ww3] protocol = git -#tag = ww3_noresm0.0.10 -#repo_url = https://github.com/NorESMhub/WW3.git -tag = 532fb765 -repo_url = https://github.com/mvertens/WW3.git +tag = ww3_noresm0.0.11 +repo_url = https://github.com/NorESMhub/WW3.git local_path = WW3 required = True From 4163d1e6f834fb32b11cd5affe6136cdc17a676e Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 29 Aug 2024 11:04:24 +0200 Subject: [PATCH 14/45] updated WW3 to ww3_noresm0.0.13 --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 6cba079..bdf0c11 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,6 +1,6 @@ [ww3] protocol = git -tag = ww3_noresm0.0.11 +tag = ww3_noresm0.0.13 repo_url = https://github.com/NorESMhub/WW3.git local_path = WW3 required = True From 8df0f270ffba3e132729a7cc86d67c85b8e1da31 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Mon, 30 Sep 2024 14:07:02 +0200 Subject: [PATCH 15/45] changes for netcdf updates to WW3 --- .gitignore | 3 --- cime_config/buildlib | 7 +++++-- cime_config/config_component.xml | 4 ---- cime_config/namelist_definition_ww3.xml | 18 ++++++++---------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 64dd42f..748414e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -# Externals -WW3 - # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/cime_config/buildlib b/cime_config/buildlib index 1c6c0c8..af5e965 100755 --- a/cime_config/buildlib +++ b/cime_config/buildlib @@ -35,6 +35,7 @@ def buildlib(bldroot, libroot, case, compname=None): exe_root = case.get_value("EXEROOT") srcpath = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, "WW3", "model", "src")) + srcroot = case.get_value("SRCROOT") # Determine cmake flags use_unstruct = case.get_value("WW3_UNSTRUCT") @@ -44,6 +45,8 @@ def buildlib(bldroot, libroot, case, compname=None): cmake_flags += " -DCMAKE_INSTALL_PREFIX:PATH=/" cmake_flags += " -DLIBROOT={} ".format(libroot) cmake_flags += " -DMPILIB={} ".format(mpilib) + cmake_flags += " -DSRCROOT={} ".format(srcroot) + use_unstruct = case.get_value("WW3_UNSTRUCT") if use_unstruct: cmake_flags += " -DUSE_UNSTRUCT=on " @@ -112,12 +115,12 @@ def buildlib(bldroot, libroot, case, compname=None): shutil.move("mod_def.ww3.log", os.path.join(rundir, "mod_def.ww3.log")) else: - # Use mod_def already created + # Use mod_def already created mod_def_in = case.get_value("WW3_MODDEF") if os.path.isfile(mod_def_in): import filecmp copy_file = False - if not os.path.isfile(os.path.join(rundir, "mod_def.ww3")): + if not os.path.isfile(os.path.join(rundir, "mod_def.ww3")): copy_file = True elif not filecmp.cmp(mod_def_in, os.path.join(rundir, "mod_def.ww3")): copy_file = True diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 700a560..b19c582 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -43,10 +43,6 @@ char unset - - $DIN_LOC_ROOT/wav/ww3/gx1v7.mod_def.ww3.wwver7.14.220506 - $DIN_LOC_ROOT/wav/ww3/wt061.mod_def.ww3.wwver7.14.220504 - case_comp env_build.xml mod_def file to use. The value depends on the switches, if you have an unstructured mesh and the diff --git a/cime_config/namelist_definition_ww3.xml b/cime_config/namelist_definition_ww3.xml index e0b25c1..8c64f29 100644 --- a/cime_config/namelist_definition_ww3.xml +++ b/cime_config/namelist_definition_ww3.xml @@ -35,16 +35,14 @@ "" "" - $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 - $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 - $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 - $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 - $DIN_LOC_ROOT/wav/ww3/wt061.restart.ww3.calm.wwver7.14.220110 - $DIN_LOC_ROOT/wav/ww3/wt061.restart.ww3.calm.wwver7.14.220110 - ' ' - ' ' - $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 - $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 + $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 + $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 + $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 + $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 + ' ' + ' ' + $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 + $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 Initial condition file. From b95a6d69b1bd7b900d389dd052eedaf400c2d015 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Mon, 30 Sep 2024 14:18:32 +0200 Subject: [PATCH 16/45] added WW3 as a submodule --- .gitmodules | 3 +++ WW3 | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 WW3 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..05df0db --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "WW3"] + path = WW3 + url = https://github.com/NorESMhub/WW3.git diff --git a/WW3 b/WW3 new file mode 160000 index 0000000..aa46bd9 --- /dev/null +++ b/WW3 @@ -0,0 +1 @@ +Subproject commit aa46bd927f782848ac789ab0e7953982765c97f8 From 0d724719683cfc86370eb0a0f413d0e40051ccf3 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Mon, 30 Sep 2024 14:24:38 +0200 Subject: [PATCH 17/45] removed Externals.cfg in preparation for git-fleximod --- Externals.cfg | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Externals.cfg diff --git a/Externals.cfg b/Externals.cfg deleted file mode 100644 index bdf0c11..0000000 --- a/Externals.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ww3] -protocol = git -tag = ww3_noresm0.0.13 -repo_url = https://github.com/NorESMhub/WW3.git -local_path = WW3 -required = True - -[externals_description] -schema_version = 1.0.0 From 4661227c30165ecc57cd5ecd7a6c687317417faf Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 1 Oct 2024 19:05:59 +0200 Subject: [PATCH 18/45] updated WW3 submodule --- .gitmodules | 2 +- WW3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 05df0db..fb173a3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "WW3"] path = WW3 - url = https://github.com/NorESMhub/WW3.git + url = https://github.com/mvertens/WW3.git diff --git a/WW3 b/WW3 index aa46bd9..d9d7e2a 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit aa46bd927f782848ac789ab0e7953982765c97f8 +Subproject commit d9d7e2a8e77f8cc79e006078e7e369f2972b817e From 552e3bee265b4c0cef4ad0da82ff62bd23210852 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Sun, 13 Oct 2024 20:49:32 +0200 Subject: [PATCH 19/45] Updated WW3 to bring in updates from Denise Worthen --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index d9d7e2a..a189d44 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit d9d7e2a8e77f8cc79e006078e7e369f2972b817e +Subproject commit a189d44268a8d7c259f04d02eafe71fdee3b1af2 From c51ddd918cf2315f20c1e59641274afc33a6ecf4 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 22 Oct 2024 15:08:20 +0200 Subject: [PATCH 20/45] new namelist settings and fix for auxiliary output in cmeps --- WW3 | 2 +- cime_config/namelist_definition_ww3.xml | 34 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/WW3 b/WW3 index a189d44..504c19a 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit a189d44268a8d7c259f04d02eafe71fdee3b1af2 +Subproject commit 504c19a2105d325c5e82bed8fbef8b6aea2751cb diff --git a/cime_config/namelist_definition_ww3.xml b/cime_config/namelist_definition_ww3.xml index 8c64f29..e746de0 100644 --- a/cime_config/namelist_definition_ww3.xml +++ b/cime_config/namelist_definition_ww3.xml @@ -393,4 +393,38 @@ + + char + time + ww3_inparm + never,nseconds,nhours,ndays,nmonths,nyears,monthly,yearly,end + + ww3 history output option (used with history_n) + history_option alarms are: + [never], turns option off + [nseconds] , history snapshot every history_n nseconds, relative to current run start time + [nhours] , history snapshot every history_n nhours , relative to current run start time + [ndays] , history snapshot every history_n ndays , relative to current run start time + [monthly] , history snapshot every month , relative to current run start time + [nmonths] , history snapshot every history_n nmonths , relative to current run start time + [yearly] , history snapshot every year , relative to current run start time + [end] , history snapshot at end + + + never + + + + + integer + time + ww3_inparm + + sets history file frequency + + + 1 + + + From 565d08ed1c27ee48d8dc77b664057ee98e2bb1ff Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 22 Oct 2024 15:45:45 +0200 Subject: [PATCH 21/45] updated WW3 --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index 504c19a..7206094 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 504c19a2105d325c5e82bed8fbef8b6aea2751cb +Subproject commit 720609411a01b4f80e82742b42c72c88c0ca52a3 From 46939b1f52e6310755b4892134d449ddf96250b4 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 7 Nov 2024 14:50:41 +0100 Subject: [PATCH 22/45] updated WW3 submodule --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index 7206094..4641474 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 720609411a01b4f80e82742b42c72c88c0ca52a3 +Subproject commit 4641474f820a13efda1d53a3e8e1acad75b77435 From 91eef014d5f6546e867976f9d11d9406a6d62c9b Mon Sep 17 00:00:00 2001 From: Steve Goldhaber Date: Mon, 25 Nov 2024 17:05:21 +0100 Subject: [PATCH 23/45] Convert WW3 to git fleximod --- .gitignore | 5 +---- .gitmodules | 35 +++++++++++++++++++++++++++++++++++ Externals.cfg | 9 --------- WW3 | 1 + 4 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 .gitmodules delete mode 100644 Externals.cfg create mode 160000 WW3 diff --git a/.gitignore b/.gitignore index 64dd42f..d3e24b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,7 @@ -# Externals -WW3 - # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] cime_config/buildnmlc cime_config/buildlibc *$py.class -buildnmlc \ No newline at end of file +buildnmlc diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..09b5a2b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,35 @@ +# This is a git submodule file with additional support for +# git-fleximod (https://github.com/ESMCI/git-fleximod) +# +# The additional flags supported by git-fleximod are +# fxtag - the tag associated with the submodule, this tag can be tested for +# consistancy with the submodule hash using git-fleximod status +# the hash can be updated to the tag using git-fleximod update +# +# fxrequired - indicates if a given submodule should be checked out on install +# submoudules can be toplevel or internal and required or optional +# toplevel means that the submodule should only be checked out if the +# module is the toplevel of the git repo (is not a submodule itself) +# internal means that the submodule is needed by the component whether +# the component is toplevel or the submodule of another repo +# required means that the submodule should always be checked out +# optional means that the submodule should only be checked out if the +# optional flag is provided to git-fleximod or the submodule name is +# explicitly listed on the git-fleximod command line. +# +# fxsparse - this is a path to a git sparse checkout file indicating that the +# submodule should be checked out in sparse mode +# +# fxDONOTUSEurl - this field is used by git-fleximod test to insure that the url is pointing +# to the official url of the repo and not to an unofficial fork. +# It is intended for use of github workflows to test commits to protected +# repository branches. +# + +[submodule "ww3"] +url = https://github.com/NorESMhub/WW3.git +path = WW3 +fxtag = ww3_noresm0.0.13 +required = True +fxrequired = AlwaysRequired +fxDONOTUSEurl = https://github.com/NorESMhub/WW3.git diff --git a/Externals.cfg b/Externals.cfg deleted file mode 100644 index bdf0c11..0000000 --- a/Externals.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ww3] -protocol = git -tag = ww3_noresm0.0.13 -repo_url = https://github.com/NorESMhub/WW3.git -local_path = WW3 -required = True - -[externals_description] -schema_version = 1.0.0 diff --git a/WW3 b/WW3 new file mode 160000 index 0000000..4bc7b20 --- /dev/null +++ b/WW3 @@ -0,0 +1 @@ +Subproject commit 4bc7b20c0d4b9d5f9cd1f225310382554c2cad78 From c4a5bb05ea25377a21b512357f45e006cfa5d6af Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Fri, 14 Mar 2025 12:43:23 +0100 Subject: [PATCH 24/45] updates to remove unnecessary namelists, etc --- cime_config/buildlib | 51 ------------ cime_config/buildnml | 68 +++++++++++++--- cime_config/namelist_definition_ww3.xml | 100 ------------------------ 3 files changed, 59 insertions(+), 160 deletions(-) diff --git a/cime_config/buildlib b/cime_config/buildlib index af5e965..769b4e9 100755 --- a/cime_config/buildlib +++ b/cime_config/buildlib @@ -78,57 +78,6 @@ def buildlib(bldroot, libroot, case, compname=None): s,o,e = run_cmd("make install VERBOSE=1 DESTDIR={}".format(destdir), from_dir=bldroot, verbose=True) expect(not s,"ERROR from make output={}, error={}".format(o,e)) - #---------------------------------------------------- - # Prestage necessary files to rundir - #---------------------------------------------------- - rundir = case.get_value("RUNDIR") - - # Create rundir/ww3_moddef_create - filename = "ww3_grid" - item = os.path.join(bldroot, filename) - if os.path.isfile(item): - ww3_moddef_dir = os.path.join(rundir, "ww3_moddef_create") - if not os.path.exists(ww3_moddef_dir): - os.makedirs(ww3_moddef_dir) - safe_copy(item, ww3_moddef_dir) - - if case.get_value("WW3_MODDEF") == 'unset': - # Create output dir ww3_moddef_create if appropriate - output_dir = os.path.join(rundir, "ww3_moddef_create") - if not os.path.exists(output_dir): - os.makedirs(output_dir) - - # Copy ww3_inp and other needed info to ww3_moddef_create directory - input_dir = case.get_value("WW3_GRID_INP_DIR") - files = os.listdir(input_dir) - for filename in files: - if not os.path.isfile(os.path.join(output_dir, filename)): - shutil.copy(os.path.join(input_dir, filename), os.path.join(output_dir, filename)) - - # Create mod_def file using ww3_grid and the grid_input files - os.chdir(output_dir) - os.scandir() - os.system("./ww3_grid > mod_def.ww3.log") - - # Copy mod_def.ww3 to $RUNDIR - shutil.move("mod_def.ww3", os.path.join(rundir, "mod_def.ww3")) - shutil.move("mod_def.ww3.log", os.path.join(rundir, "mod_def.ww3.log")) - - else: - # Use mod_def already created - mod_def_in = case.get_value("WW3_MODDEF") - if os.path.isfile(mod_def_in): - import filecmp - copy_file = False - if not os.path.isfile(os.path.join(rundir, "mod_def.ww3")): - copy_file = True - elif not filecmp.cmp(mod_def_in, os.path.join(rundir, "mod_def.ww3")): - copy_file = True - if copy_file: - shutil.copy(mod_def_in, os.path.join(rundir, "mod_def.ww3")) - else: - raise RuntimeError("mod_def_in {} does not exist on disk".format(mod_def_in)) - def _main_func(args): caseroot, libroot, bldroot = parse_input(args) with Case(caseroot) as case: diff --git a/cime_config/buildnml b/cime_config/buildnml index 683f696..780c69a 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -72,20 +72,12 @@ def _create_namelists(case, confdir, namelist_infile, nmlgen, data_list_path): expect(False, 'dtcpl {} is not a multiple of dtmax {}'.format(dtcpl,dtmax)) - nmlgen.set_value("domain_percent_start", f"{start_date} {start_tod}") - - nmlgen.set_value("date_percent_field_percent_start" , f"{start_date} {start_tod}") - nmlgen.set_value("date_percent_restart_percent_start", f"{start_date} {start_tod}") - - nmlgen.set_value("date_percent_field_percent_stride" , f"{dtime_sync}") - nmlgen.set_value("date_percent_restart_percent_stride", f"{dtime_sync}") - # write diagnostic info logger.debug("ww3 initial conditions file is %s", nmlgen.get_value("initfile")) namelist_file = os.path.join(confdir, "wav_in") nmlgen.write_output_file(namelist_file, data_list_path, - groups=["domain_nml","input_nml","output_type_nml","output_date_nml","ww3_inparm"], + groups=["input_nml","output_type_nml","ww3_inparm"], sorted_groups=False) from pathlib import Path @@ -179,6 +171,64 @@ def buildnml(case, caseroot, compname): logger.debug("WW3 namelist copy: file1 %s file2 %s ", file1, file2) shutil.copy2(file1, file2) + _prestage_inputs(case) + +############################################################################### +def _prestage_inputs(case): +############################################################################### + #---------------------------------------------------- + # Prestage necessary files to rundir + #---------------------------------------------------- + rundir = case.get_value("RUNDIR") + + # Create rundir/ww3_moddef_create + filename = "ww3_grid" + bldroot = os.path.join(case.get_value("EXEROOT"),"wav","obj") + item = os.path.join(bldroot, filename) + if os.path.isfile(item): + ww3_moddef_dir = os.path.join(rundir, "ww3_moddef_create") + if not os.path.exists(ww3_moddef_dir): + os.makedirs(ww3_moddef_dir) + if not os.path.exists(os.path.join(ww3_moddef_dir,filename)): + safe_copy(item, ww3_moddef_dir) + + if case.get_value("WW3_MODDEF") == 'unset': + # Create output dir ww3_moddef_create if appropriate + output_dir = os.path.join(rundir, "ww3_moddef_create") + if not os.path.exists(output_dir): + os.makedirs(output_dir) + + # Copy ww3_inp and other needed info to ww3_moddef_create directory + input_dir = case.get_value("WW3_GRID_INP_DIR") + files = os.listdir(input_dir) + for filename in files: + if not os.path.isfile(os.path.join(output_dir, filename)): + safe_copy(os.path.join(input_dir, filename), os.path.join(output_dir, filename)) + + # Create mod_def file using ww3_grid and the grid_input files + if os.path.isfile(os.path.join(output_dir,"ww3_grid")): + run_cmd("./ww3_grid > mod_def.ww3.log", from_dir=output_dir) + if not os.path.isfile(os.path.join(output_dir,"mod_def.ww3")): + raise RuntimeError("mod_def.ww3 was not created, check mod_def.ww3.log for errors.") + shutil.move(os.path.join(output_dir,"mod_def.ww3"), os.path.join(rundir, "mod_def.ww3")) + else: + logger.warning("ww3_grid file not found. The mod_def.ww3 file will be created after the build phase.") + + else: + # Use mod_def already created + mod_def_in = case.get_value("WW3_MODDEF") + if os.path.isfile(mod_def_in): + import filecmp + copy_file = False + if not os.path.isfile(os.path.join(rundir, "mod_def.ww3")): + copy_file = True + elif not filecmp.cmp(mod_def_in, os.path.join(rundir, "mod_def.ww3")): + copy_file = True + if copy_file: + shutil.copy(mod_def_in, os.path.join(rundir, "mod_def.ww3")) + else: + raise RuntimeError("mod_def_in {} does not exist on disk".format(mod_def_in)) + ############################################################################### def _main_func(): ############################################################################### diff --git a/cime_config/namelist_definition_ww3.xml b/cime_config/namelist_definition_ww3.xml index e746de0..c71cf66 100644 --- a/cime_config/namelist_definition_ww3.xml +++ b/cime_config/namelist_definition_ww3.xml @@ -138,23 +138,6 @@ - - char - domain_nml - setup - - unset - - - - char - domain_nml - setup - - '99990101 0' - - - char input_nml @@ -310,89 +293,6 @@ - - char - output_date_nml - setup - - 1 - - - - char - output_date_nml - setup - - unset - - - - char - output_date_nml - setup - - unset - - - - char - output_date_nml - setup - - 99990101 0 - - - - - char - output_date_nml - setup - - unset - - - - char - output_date_nml - setup - - unset - - - - char - output_date_nml - setup - - 99990101 0 - - - - - char - output_date_nml - setup - - 99990101 0 - - - - char - output_date_nml - setup - - 0 - - - - char - output_date_nml - setup - - 99990101 0 - - - char time From 694e18d75cfd4176570bd49391216b68d7691395 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Wed, 19 Mar 2025 07:50:17 +0100 Subject: [PATCH 25/45] updated WW3 for fix for ERI --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index 4641474..b7599db 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 4641474f820a13efda1d53a3e8e1acad75b77435 +Subproject commit b7599db3610e67d6596d00efa09ffdb16c54d186 From 4d2a0d360f331dc8d4e17d266770ffaee79d0fba Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Wed, 19 Mar 2025 07:50:43 +0100 Subject: [PATCH 26/45] fix for ERI tests to pass --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 780c69a..6a96797 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -60,7 +60,7 @@ def _create_namelists(case, confdir, namelist_infile, nmlgen, data_list_path): run_refcase = case.get_value("RUN_REFCASE") run_refdate = case.get_value("RUN_REFDATE") run_tod = case.get_value("RUN_REFTOD") - filename = "%s.ww3.r.%s-%s" %(run_refcase, run_refdate, run_tod) + filename = "%s.ww3.r.%s-%s.nc" %(run_refcase, run_refdate, run_tod) nmlgen.add_default("initfile", value=filename, ignore_abs_path=True) else: nmlgen.add_default("initfile") From 3c5e2fd88e28494afd29a8dc49bf9f7d921f2ff9 Mon Sep 17 00:00:00 2001 From: mvdebolskiy Date: Thu, 20 Mar 2025 11:57:53 +0100 Subject: [PATCH 27/45] add gnu tests and fix test names --- cime_config/config_pes.xml | 37 +++++++++++++++++++++++++++ cime_config/testdefs/testlist_ww3.xml | 14 +++++----- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index a6b69e7..6e57350 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -40,4 +40,41 @@ + + + + none + + -4 + -4 + -4 + -4 + -4 + -4 + -4 + -4 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + diff --git a/cime_config/testdefs/testlist_ww3.xml b/cime_config/testdefs/testlist_ww3.xml index 034549b..b458f9b 100644 --- a/cime_config/testdefs/testlist_ww3.xml +++ b/cime_config/testdefs/testlist_ww3.xml @@ -16,15 +16,15 @@ - + - + - + @@ -32,20 +32,20 @@ - + - + - + - + From b1ff4ecb424f404fe1fca93ed1c49379a6a741ff Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 20 Mar 2025 16:38:27 +0100 Subject: [PATCH 28/45] commit expected fail tests --- cime_config/testdefs/testlist_ww3.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_ww3.xml b/cime_config/testdefs/testlist_ww3.xml index b458f9b..6fe8320 100644 --- a/cime_config/testdefs/testlist_ww3.xml +++ b/cime_config/testdefs/testlist_ww3.xml @@ -32,7 +32,7 @@ - + @@ -40,7 +40,7 @@ - + From 328857af6d2860e33b326609be2f57f6e7ec78b4 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 20 Mar 2025 17:55:12 +0100 Subject: [PATCH 29/45] changes for netcdf updates to WW3 --- cime_config/buildlib | 7 +++++-- cime_config/config_component.xml | 4 ---- cime_config/namelist_definition_ww3.xml | 18 ++++++++---------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/cime_config/buildlib b/cime_config/buildlib index 1c6c0c8..af5e965 100755 --- a/cime_config/buildlib +++ b/cime_config/buildlib @@ -35,6 +35,7 @@ def buildlib(bldroot, libroot, case, compname=None): exe_root = case.get_value("EXEROOT") srcpath = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, "WW3", "model", "src")) + srcroot = case.get_value("SRCROOT") # Determine cmake flags use_unstruct = case.get_value("WW3_UNSTRUCT") @@ -44,6 +45,8 @@ def buildlib(bldroot, libroot, case, compname=None): cmake_flags += " -DCMAKE_INSTALL_PREFIX:PATH=/" cmake_flags += " -DLIBROOT={} ".format(libroot) cmake_flags += " -DMPILIB={} ".format(mpilib) + cmake_flags += " -DSRCROOT={} ".format(srcroot) + use_unstruct = case.get_value("WW3_UNSTRUCT") if use_unstruct: cmake_flags += " -DUSE_UNSTRUCT=on " @@ -112,12 +115,12 @@ def buildlib(bldroot, libroot, case, compname=None): shutil.move("mod_def.ww3.log", os.path.join(rundir, "mod_def.ww3.log")) else: - # Use mod_def already created + # Use mod_def already created mod_def_in = case.get_value("WW3_MODDEF") if os.path.isfile(mod_def_in): import filecmp copy_file = False - if not os.path.isfile(os.path.join(rundir, "mod_def.ww3")): + if not os.path.isfile(os.path.join(rundir, "mod_def.ww3")): copy_file = True elif not filecmp.cmp(mod_def_in, os.path.join(rundir, "mod_def.ww3")): copy_file = True diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 700a560..b19c582 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -43,10 +43,6 @@ char unset - - $DIN_LOC_ROOT/wav/ww3/gx1v7.mod_def.ww3.wwver7.14.220506 - $DIN_LOC_ROOT/wav/ww3/wt061.mod_def.ww3.wwver7.14.220504 - case_comp env_build.xml mod_def file to use. The value depends on the switches, if you have an unstructured mesh and the diff --git a/cime_config/namelist_definition_ww3.xml b/cime_config/namelist_definition_ww3.xml index e0b25c1..8c64f29 100644 --- a/cime_config/namelist_definition_ww3.xml +++ b/cime_config/namelist_definition_ww3.xml @@ -35,16 +35,14 @@ "" "" - $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 - $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 - $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 - $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 - $DIN_LOC_ROOT/wav/ww3/wt061.restart.ww3.calm.wwver7.14.220110 - $DIN_LOC_ROOT/wav/ww3/wt061.restart.ww3.calm.wwver7.14.220110 - ' ' - ' ' - $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 - $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 + $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 + $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 + $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 + $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 + ' ' + ' ' + $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 + $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 Initial condition file. From 5a11297c3dde1f6f8fc65e654f5f2c9d23d1905a Mon Sep 17 00:00:00 2001 From: mvdebolskiy Date: Thu, 20 Mar 2025 17:57:42 +0100 Subject: [PATCH 30/45] resolve merge --- .gitmodules | 1 + WW3 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 09b5a2b..4396f3e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,3 +33,4 @@ fxtag = ww3_noresm0.0.13 required = True fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/NorESMhub/WW3.git + diff --git a/WW3 b/WW3 index 4bc7b20..b7599db 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 4bc7b20c0d4b9d5f9cd1f225310382554c2cad78 +Subproject commit b7599db3610e67d6596d00efa09ffdb16c54d186 From 226a447fe405ef9dc48c2aee789cd36a3564c972 Mon Sep 17 00:00:00 2001 From: mvdebolskiy Date: Thu, 20 Mar 2025 18:33:43 +0100 Subject: [PATCH 31/45] update submodule --- .gitmodules | 2 +- WW3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4396f3e..d4e400e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,7 +29,7 @@ [submodule "ww3"] url = https://github.com/NorESMhub/WW3.git path = WW3 -fxtag = ww3_noresm0.0.13 +fxtag = ww3_noresm0.0.14 required = True fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/NorESMhub/WW3.git diff --git a/WW3 b/WW3 index b7599db..68dbc41 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit b7599db3610e67d6596d00efa09ffdb16c54d186 +Subproject commit 68dbc41f7beeb631082b0752861d1d84d99ec309 From f19e1845308fe04afa78790af1a52ee4b19b9da2 Mon Sep 17 00:00:00 2001 From: mvdebolskiy Date: Thu, 20 Mar 2025 19:21:05 +0100 Subject: [PATCH 32/45] add expected fails file --- cime_config/testdefs/ExpectedTestFails.xml | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 cime_config/testdefs/ExpectedTestFails.xml diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml new file mode 100644 index 0000000..01afe49 --- /dev/null +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + RUN + WW3#18 + + + + + + RUN + WW3#18 + + + + \ No newline at end of file From 5accbf3ce537fbec50bf7561eadf2c813be01608 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 3 Jun 2025 16:37:44 +0200 Subject: [PATCH 33/45] updated WW3 to ww3_noresm0.0.16 --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index 68dbc41..4736ea6 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 68dbc41f7beeb631082b0752861d1d84d99ec309 +Subproject commit 4736ea67e9ec4c6ed2a446a03425c50d1b1e7240 From 2c21f988b5de4f8c2bdcef9ba9c2a6b210cd58e4 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 3 Jun 2025 20:22:05 +0200 Subject: [PATCH 34/45] updated WW3 to ww3_noresm0.0.16 --- .gitmodules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index d4e400e..f5ca903 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,8 +29,7 @@ [submodule "ww3"] url = https://github.com/NorESMhub/WW3.git path = WW3 -fxtag = ww3_noresm0.0.14 +fxtag = ww3_noresm0.0.16 required = True fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/NorESMhub/WW3.git - From 20348922f209600a0e9b6ca71d6f0c0f9ac81155 Mon Sep 17 00:00:00 2001 From: mvertens Date: Tue, 12 May 2026 14:57:24 +0200 Subject: [PATCH 35/45] update ww3 source code --- .gitmodules | 2 +- WW3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index f5ca903..994608e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,7 +29,7 @@ [submodule "ww3"] url = https://github.com/NorESMhub/WW3.git path = WW3 -fxtag = ww3_noresm0.0.16 +fxtag = ww3_noresm0.0.17 required = True fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/NorESMhub/WW3.git diff --git a/WW3 b/WW3 index 4736ea6..500ddc6 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 4736ea67e9ec4c6ed2a446a03425c50d1b1e7240 +Subproject commit 500ddc65d918c686dbe39844fee98a934a2a0a4a From 494b2e388c329ab00dfa7ec2f975687251e3b742 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 18 Jun 2026 17:57:57 +0200 Subject: [PATCH 36/45] changes needed for WW3 PR --- WW3 | 2 +- cime_config/namelist_definition_ww3.xml | 13 +++---------- cime_config/testdefs/testlist_ww3.xml | 12 ++++++------ 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/WW3 b/WW3 index 500ddc6..db3f295 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 500ddc65d918c686dbe39844fee98a934a2a0a4a +Subproject commit db3f295d5e78c889d9e4a21d9d6a0311d0a8c98c diff --git a/cime_config/namelist_definition_ww3.xml b/cime_config/namelist_definition_ww3.xml index c71cf66..1583320 100644 --- a/cime_config/namelist_definition_ww3.xml +++ b/cime_config/namelist_definition_ww3.xml @@ -33,20 +33,13 @@ ww3_inparm setup - "" - "" - $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 - $DIN_LOC_ROOT/wav/ww3/ww3a.restart.ww3.calm.wwver7.14.220119 - $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 - $DIN_LOC_ROOT/wav/ww3/gx1v7.restart.ww3.calm.wwver7.14.220328 - ' ' - ' ' - $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 - $DIN_LOC_ROOT/wav/ww3/wtnx1v4.restart.ww3.230308 + "" + "" Initial condition file. This is set in ww buildnml from refacase and refdate for branch runs + For initial runs assume calm data - or point to a netcdf restart file. diff --git a/cime_config/testdefs/testlist_ww3.xml b/cime_config/testdefs/testlist_ww3.xml index 6fe8320..e0ff6c5 100644 --- a/cime_config/testdefs/testlist_ww3.xml +++ b/cime_config/testdefs/testlist_ww3.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + From 7a921c4d5bc399f0681790865dedbfa6c1637108 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Tue, 7 Jul 2026 15:24:44 +0200 Subject: [PATCH 37/45] more updates to tests --- WW3 | 2 +- cime_config/config_pes.xml | 38 +++++++++ cime_config/testdefs/ExpectedTestFails.xml | 19 +---- cime_config/testdefs/testlist_ww3.xml | 79 ++++++++++++++++++- .../ww3/legacy_cpl/shell_commands | 1 + 5 files changed, 116 insertions(+), 23 deletions(-) create mode 100644 cime_config/testdefs/testmods_dirs/ww3/legacy_cpl/shell_commands diff --git a/WW3 b/WW3 index db3f295..61ad265 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit db3f295d5e78c889d9e4a21d9d6a0311d0a8c98c +Subproject commit 61ad26599e6ea1203b92be9d030fd7cb9a3f3c44 diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 6e57350..76560f3 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -42,6 +42,44 @@ + + none + + -8 + -8 + -8 + -8 + -8 + -8 + -8 + -8 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + none diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 01afe49..d95914f 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -27,21 +27,4 @@ sort of comment you desire. --> - - - - - - RUN - WW3#18 - - - - - - RUN - WW3#18 - - - - \ No newline at end of file + diff --git a/cime_config/testdefs/testlist_ww3.xml b/cime_config/testdefs/testlist_ww3.xml index e0ff6c5..49dac36 100644 --- a/cime_config/testdefs/testlist_ww3.xml +++ b/cime_config/testdefs/testlist_ww3.xml @@ -2,6 +2,7 @@ + @@ -10,22 +11,24 @@ + - + - + - + + @@ -34,18 +37,86 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/ww3/legacy_cpl/shell_commands b/cime_config/testdefs/testmods_dirs/ww3/legacy_cpl/shell_commands new file mode 100644 index 0000000..4f7fc48 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/ww3/legacy_cpl/shell_commands @@ -0,0 +1 @@ +./xmlchange MOM6_WW3_CPL_METHOD="legacy" From f2e023555a7cd29d8729a4218b01519abe395e7a Mon Sep 17 00:00:00 2001 From: mvertens Date: Thu, 9 Jul 2026 11:08:10 +0200 Subject: [PATCH 38/45] updated comments --- cime_config/user_nl_ww3 | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/cime_config/user_nl_ww3 b/cime_config/user_nl_ww3 index 57f8111..de661c1 100644 --- a/cime_config/user_nl_ww3 +++ b/cime_config/user_nl_ww3 @@ -14,19 +14,18 @@ ! input_percent_forcing_percent_winds => input%forcing%winds ! input_percent_forcing_percent_ice_conc => input%forcing%ice_conc ! input_percent_forcing_percent_ice_param1 => input%forcing%ice_param1 +! input_percent_forcing_percent_ice_param1 => input%forcing%ice_param2 +! input_percent_forcing_percent_ice_param1 => input%forcing%ice_param3 +! input_percent_forcing_percent_ice_param1 => input%forcing%ice_param4 ! input_percent_forcing_percent_ice_param5 => input%forcing%ice_param5 +! input_percent_forcing_percent_ice_param5 => input%forcing%atm_momentum +! input_percent_forcing_percent_ice_param5 => input%forcing%air_density +! input_percent_forcing_percent_ice_param5 => input%forcing%mud_momentum +! +! input_percent_assim_percent_mean => input%assim%mean +! input_percent_assim_percent_spec1d => input%assim%spec1d +! input_percent_assim_percent_spec2d => input%assim%spec2d ! ! type_percent_field_percent_list => type%field%list ! type_percent_point_percent_file => type%point%file -! -! date_percent_field_percent_outffile => date%field%outffile -! date_percent_field_percent_start => date%field%start -! date_percent_field_percent_stride => date%field%stride -! date_percent_field_percent_stop => date%field%stop -! date_percent_restart_percent_start => date%restart%start -! date_percent_restart_percent_stride => date%restart%stride -! date_percent_restart_percent_stop => date%restart%stop -! date_percent_restart2_percent_start => date%restart2%start -! date_percent_restart2_percent_strid => date%restart2%stride -! date_percent_restart2_percent_stop => date%restart2%stop !---------------------------------------------------------------------------------- From f50901f9451a6d6acaf068ab76241d84e0b2b4a5 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 9 Jul 2026 11:10:29 +0200 Subject: [PATCH 39/45] updated WW3 to dev/unified_0.1.0_noresm_v0 --- .gitmodules | 2 +- WW3 | 2 +- cime_config/user_nl_ww3 | 25 ++++++++++++------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index 994608e..ea85b57 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,7 +29,7 @@ [submodule "ww3"] url = https://github.com/NorESMhub/WW3.git path = WW3 -fxtag = ww3_noresm0.0.17 +fxtag = dev/unified_0.1.0_noresm_v0 required = True fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/NorESMhub/WW3.git diff --git a/WW3 b/WW3 index 61ad265..f373cec 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 61ad26599e6ea1203b92be9d030fd7cb9a3f3c44 +Subproject commit f373cecfa6f8a9effa94e5b3aebf07c7223f749b diff --git a/cime_config/user_nl_ww3 b/cime_config/user_nl_ww3 index 57f8111..5033d86 100644 --- a/cime_config/user_nl_ww3 +++ b/cime_config/user_nl_ww3 @@ -11,22 +11,21 @@ ! ! input_percent_forcing_percent_water_levels=> input%forcing%water_levels ! input_percent_forcing_percent_currents => input%forcing%currents -! input_percent_forcing_percent_winds => input%forcing%winds +! input_percent_forcing_percent_winds => input%forcing%winds ! input_percent_forcing_percent_ice_conc => input%forcing%ice_conc ! input_percent_forcing_percent_ice_param1 => input%forcing%ice_param1 +! input_percent_forcing_percent_ice_param1 => input%forcing%ice_param2 +! input_percent_forcing_percent_ice_param1 => input%forcing%ice_param3 +! input_percent_forcing_percent_ice_param1 => input%forcing%ice_param4 ! input_percent_forcing_percent_ice_param5 => input%forcing%ice_param5 -! +! input_percent_forcing_percent_ice_param5 => input%forcing%atm_momentum +! input_percent_forcing_percent_ice_param5 => input%forcing%air_density +! input_percent_forcing_percent_ice_param5 => input%forcing%mud_momentum +! +! input_percent_assim_percent_mean => input%assim%mean +! input_percent_assim_percent_spec1d => input%assim%spec1d +! input_percent_assim_percent_spec2d => input%assim%spec2d +! ! type_percent_field_percent_list => type%field%list ! type_percent_point_percent_file => type%point%file -! -! date_percent_field_percent_outffile => date%field%outffile -! date_percent_field_percent_start => date%field%start -! date_percent_field_percent_stride => date%field%stride -! date_percent_field_percent_stop => date%field%stop -! date_percent_restart_percent_start => date%restart%start -! date_percent_restart_percent_stride => date%restart%stride -! date_percent_restart_percent_stop => date%restart%stop -! date_percent_restart2_percent_start => date%restart2%start -! date_percent_restart2_percent_strid => date%restart2%stride -! date_percent_restart2_percent_stop => date%restart2%stop !---------------------------------------------------------------------------------- From 7b949a129736f0d25b4d44ccd185cfe1944108e4 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 9 Jul 2026 18:30:09 +0200 Subject: [PATCH 40/45] updated WW3 and added testmod wav_24h_avg --- cime_config/testdefs/testmods_dirs/ww3/wav_24h_avg/user_nl_cpl | 1 + 1 file changed, 1 insertion(+) create mode 100644 cime_config/testdefs/testmods_dirs/ww3/wav_24h_avg/user_nl_cpl diff --git a/cime_config/testdefs/testmods_dirs/ww3/wav_24h_avg/user_nl_cpl b/cime_config/testdefs/testmods_dirs/ww3/wav_24h_avg/user_nl_cpl new file mode 100644 index 0000000..f19259a --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/ww3/wav_24h_avg/user_nl_cpl @@ -0,0 +1 @@ +histaux_wav2med_file1_ntperfile = 1 \ No newline at end of file From 113cb0b76b16d024ee3436d1923763b48677c7bb Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 9 Jul 2026 22:33:08 +0200 Subject: [PATCH 41/45] more updates for merge to main_0.1.0 --- .gitignore | 2 +- cime_config/config_component.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d3e24b1..748414e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ __pycache__/ cime_config/buildnmlc cime_config/buildlibc *$py.class -buildnmlc +buildnmlc \ No newline at end of file diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 7528e25..2019866 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -46,7 +46,7 @@ case_comp env_build.xml mod_def file to use. The value depends on the switches, if you have an unstructured mesh and the - wave propagation scheme. Note that this file is renamed to mod_def.ww3 in the run directory. + wave propoagation scheme. Note that this file is renamed to mod_def.ww3 in the run directory. From 6012b6a0100ea8931551919ad38aa8e95f896378 Mon Sep 17 00:00:00 2001 From: mvertens Date: Tue, 14 Jul 2026 14:44:22 +0200 Subject: [PATCH 42/45] removed trailing whitespace --- cime_config/config_compsets.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 00e6c6c..1990581 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -4,15 +4,15 @@ Each compset node is associated with the following elements - - lname - - alias + - lname + - alias - support (optional description of the support level for this compset) Each compset node can also have the following attributes - grid (optional regular expression match for grid to work with the compset) - WW3test + WW3test 2000_DATM%NYF_SLND_SICE_SOCN_SROF_SGLC_WW3 From 56556db5930322ca272437bf15ef8efca4cca7c9 Mon Sep 17 00:00:00 2001 From: mvertens Date: Tue, 14 Jul 2026 23:12:57 +0200 Subject: [PATCH 43/45] Update cime_config/config_component.xml Co-authored-by: goldy <1588651+gold2718@users.noreply.github.com> --- cime_config/config_component.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 2019866..7528e25 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -46,7 +46,7 @@ case_comp env_build.xml mod_def file to use. The value depends on the switches, if you have an unstructured mesh and the - wave propoagation scheme. Note that this file is renamed to mod_def.ww3 in the run directory. + wave propagation scheme. Note that this file is renamed to mod_def.ww3 in the run directory. From 6082d35e1cb11a626c61e146614bb04355fc4f49 Mon Sep 17 00:00:00 2001 From: mvertens Date: Tue, 14 Jul 2026 23:13:28 +0200 Subject: [PATCH 44/45] Update cime_config/config_pes.xml Co-authored-by: goldy <1588651+gold2718@users.noreply.github.com> --- cime_config/config_pes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 76560f3..f0490e8 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -1,6 +1,6 @@ - + From 34508821480d2ef15dab582de853a27cb15f48cf Mon Sep 17 00:00:00 2001 From: mvertens Date: Tue, 14 Jul 2026 23:14:02 +0200 Subject: [PATCH 45/45] Update README.md Co-authored-by: goldy <1588651+gold2718@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 743d835..fbcce98 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # WW3_interface -This repository encapsulates the newest CESM WaveWatch III repository (forked from NOAA-EMC) and acts as an interface between WW3 and CESM. +This repository encapsulates the newest NorESM WaveWatch III repository (forked from NOAA-EMC) and acts as an interface between WW3 and NorESM.