Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0389dfc
Interim Commit while migrating from FCM branch - XML, namelist and ro…
mcdalvi Apr 29, 2026
388b69b
Second commit transferring changes from FCM: Nudging field and file ,…
mcdalvi Apr 29, 2026
8a745da
Compilation fixes, mainly updating other calls to setup_model_data fo…
mcdalvi Apr 30, 2026
e2c6817
Improve trigerring in metadata
mcdalvi Apr 30, 2026
05b457a
include files that were not explicitly 'git add'ed
mcdalvi May 1, 2026
f1f0ddb
First round of fixes from testing: only handle fields and settings th…
mcdalvi May 5, 2026
dd2ed96
Fixes -mostly aligning field definitions; rationalised tests to use 3…
mcdalvi May 12, 2026
de251b0
merge into origin/main at 08455b0
mcdalvi May 13, 2026
8baec12
modify path to point to files containing licence information
mcdalvi May 13, 2026
ea85331
Minor fixes, style fixer, update KGOs
mcdalvi May 13, 2026
d4f3adc
Metadata fiex and re-alignment with configuration variables in modeld…
mcdalvi May 14, 2026
50f08f3
more metadata and style fixes
mcdalvi May 14, 2026
7723834
Changes in response to Code owner review: Remove new fields from xml …
mcdalvi May 15, 2026
d48f524
Rename test group to reflect target system and add to *lfric_atm_azsp…
mcdalvi May 18, 2026
642225b
Changes from review -configure *nudging_era_coarse* test to use coars…
mcdalvi May 19, 2026
3293ee2
Update KGO for *nudging_coarse* test, now reverted back to main mesh …
mcdalvi May 19, 2026
b906772
Changes from Review- mainly consistent naming of fields; remove dupli…
mcdalvi May 29, 2026
6975f0a
Attempt to get away from hardwired numbers in collection declaration.
mcdalvi Jun 5, 2026
344ff27
Revert some changes after review as modeldb may not available in all …
mcdalvi Jun 11, 2026
7818d2d
Expand use of configuration API for new items. However, this requires…
mcdalvi Jun 15, 2026
a692006
Merge in main at 0337ca1
mcdalvi Jun 17, 2026
55356f3
Pass in *modeldb* to process nudging fields to allow accessing of con…
mcdalvi Jun 18, 2026
f2b5edc
Only pass the required configuration information information to *proc…
mcdalvi Jun 18, 2026
6f76af3
Merge main into branch after #504
mcdalvi Jun 19, 2026
1eec0e3
Correct order of upgrade_macros
mcdalvi Jun 19, 2026
b97aae6
Point to core branch, updatte KGOs
mcdalvi Jun 19, 2026
163d1cb
Merge branch 'main' into vn3.1.1_read_nudging_data
MatthewHambley Jun 22, 2026
3a821f9
Changes in response to #502: create nudging fields in new *create_phy…
mcdalvi Jun 22, 2026
5a9ce1a
Revert some of the changes made in response to #502
mcdalvi Jun 22, 2026
191da64
Merge branch 'main' into vn3.1.1_read_nudging_data
MatthewHambley Jun 22, 2026
da85031
Update configuration meta-data.
MatthewHambley Jun 23, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -880,3 +880,55 @@ def upgrade(self, config, meta_config=None):
)

return config, self.reports


class vn31_t474(MacroUpgrade):
"""Upgrade macro for ticket #474 by Mohit Dalvi."""

BEFORE_TAG = "vn3.1_t401"
AFTER_TAG = "vn3.1_t474"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-gungho
self.add_setting(config, ["namelist:files", "nudging_directory"], "''")
self.add_setting(config, ["namelist:files", "nudging_filename"], "''")
self.add_setting(
config,
["namelist:multires_coupling", "coarse_nudging"],
".false.",
)
self.add_setting(
config, ["namelist:multires_coupling", "nudging_mesh_name"], "''"
)
# Add new nudging namelist -with sensible default values
# Append after 'multires_coupling' in configuration.nml
source = self.get_setting_value(
config, ["file:configuration.nml", "source"]
)
source = re.sub(
r"(namelist:multires_coupling)",
r"namelist:multires_coupling)" + "\n" + " (namelist:nudging",
source,
)
self.change_setting_value(
config, ["file:configuration.nml", "source"], source
)
self.add_setting(config, ["namelist:nudging"])
self.add_setting(
config, ["namelist:nudging", "nudge_data_levels"], "137"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_bottom"], "5"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_top"], "52"
)
self.add_setting(
config, ["namelist:nudging", "nudging_source"], "'era'"
)
self.add_setting(
config, ["namelist:nudging", "nudging_width_bottom"], "1"
)
self.add_setting(config, ["namelist:nudging", "nudging_width_top"], "0")

return config, self.reports
Original file line number Diff line number Diff line change
Expand Up @@ -845,3 +845,55 @@ def upgrade(self, config, meta_config=None):
)

return config, self.reports


class vn31_t474(MacroUpgrade):
"""Upgrade macro for ticket #474 by Mohit Dalvi."""

BEFORE_TAG = "vn3.1_t401"
AFTER_TAG = "vn3.1_t474"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-gungho
self.add_setting(config, ["namelist:files", "nudging_directory"], "''")
self.add_setting(config, ["namelist:files", "nudging_filename"], "''")
self.add_setting(
config,
["namelist:multires_coupling", "coarse_nudging"],
".false.",
)
self.add_setting(
config, ["namelist:multires_coupling", "nudging_mesh_name"], "''"
)
# Add new nudging namelist -with sensible default values
# Append after 'multires_coupling' in configuration.nml
source = self.get_setting_value(
config, ["file:configuration.nml", "source"]
)
source = re.sub(
r"(namelist:multires_coupling)",
r"namelist:multires_coupling)" + "\n" + " (namelist:nudging",
source,
)
self.change_setting_value(
config, ["file:configuration.nml", "source"], source
)
self.add_setting(config, ["namelist:nudging"])
self.add_setting(
config, ["namelist:nudging", "nudge_data_levels"], "137"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_bottom"], "5"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_top"], "52"
)
self.add_setting(
config, ["namelist:nudging", "nudging_source"], "'era'"
)
self.add_setting(
config, ["namelist:nudging", "nudging_width_bottom"], "1"
)
self.add_setting(config, ["namelist:nudging", "nudging_width_top"], "0")

return config, self.reports
Original file line number Diff line number Diff line change
Expand Up @@ -845,3 +845,55 @@ def upgrade(self, config, meta_config=None):
)

return config, self.reports


class vn31_t474(MacroUpgrade):
"""Upgrade macro for ticket #474 by Mohit Dalvi."""

BEFORE_TAG = "vn3.1_t401"
AFTER_TAG = "vn3.1_t474"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-gungho
self.add_setting(config, ["namelist:files", "nudging_directory"], "''")
self.add_setting(config, ["namelist:files", "nudging_filename"], "''")
self.add_setting(
config,
["namelist:multires_coupling", "coarse_nudging"],
".false.",
)
self.add_setting(
config, ["namelist:multires_coupling", "nudging_mesh_name"], "''"
)
# Add new nudging namelist -with sensible default values
# Append after 'multires_coupling' in configuration.nml
source = self.get_setting_value(
config, ["file:configuration.nml", "source"]
)
source = re.sub(
r"(namelist:multires_coupling)",
r"namelist:multires_coupling)" + "\n" + " (namelist:nudging",
source,
)
self.change_setting_value(
config, ["file:configuration.nml", "source"], source
)
self.add_setting(config, ["namelist:nudging"])
self.add_setting(
config, ["namelist:nudging", "nudge_data_levels"], "137"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_bottom"], "5"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_top"], "52"
)
self.add_setting(
config, ["namelist:nudging", "nudging_source"], "'era'"
)
self.add_setting(
config, ["namelist:nudging", "nudging_width_bottom"], "1"
)
self.add_setting(config, ["namelist:nudging", "nudging_width_top"], "0")

return config, self.reports
52 changes: 52 additions & 0 deletions applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -880,3 +880,55 @@ def upgrade(self, config, meta_config=None):
)

return config, self.reports


class vn31_t474(MacroUpgrade):
"""Upgrade macro for ticket #474 by Mohit Dalvi."""

BEFORE_TAG = "vn3.1_t401"
AFTER_TAG = "vn3.1_t474"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-gungho
self.add_setting(config, ["namelist:files", "nudging_directory"], "''")
self.add_setting(config, ["namelist:files", "nudging_filename"], "''")
self.add_setting(
config,
["namelist:multires_coupling", "coarse_nudging"],
".false.",
)
self.add_setting(
config, ["namelist:multires_coupling", "nudging_mesh_name"], "''"
)
# Add new nudging namelist -with sensible default values
# Append after 'multires_coupling' in configuration.nml
source = self.get_setting_value(
config, ["file:configuration.nml", "source"]
)
source = re.sub(
r"(namelist:multires_coupling)",
r"namelist:multires_coupling)" + "\n" + " (namelist:nudging",
source,
)
self.change_setting_value(
config, ["file:configuration.nml", "source"], source
)
self.add_setting(config, ["namelist:nudging"])
self.add_setting(
config, ["namelist:nudging", "nudge_data_levels"], "137"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_bottom"], "5"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_top"], "52"
)
self.add_setting(
config, ["namelist:nudging", "nudging_source"], "'era'"
)
self.add_setting(
config, ["namelist:nudging", "nudging_width_bottom"], "1"
)
self.add_setting(config, ["namelist:nudging", "nudging_width_top"], "0")

return config, self.reports
Original file line number Diff line number Diff line change
Expand Up @@ -880,3 +880,55 @@ def upgrade(self, config, meta_config=None):
)

return config, self.reports


class vn31_t474(MacroUpgrade):
"""Upgrade macro for ticket #474 by Mohit Dalvi."""

BEFORE_TAG = "vn3.1_t401"
AFTER_TAG = "vn3.1_t474"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-gungho
self.add_setting(config, ["namelist:files", "nudging_directory"], "''")
self.add_setting(config, ["namelist:files", "nudging_filename"], "''")
self.add_setting(
config,
["namelist:multires_coupling", "coarse_nudging"],
".false.",
)
self.add_setting(
config, ["namelist:multires_coupling", "nudging_mesh_name"], "''"
)
# Add new nudging namelist -with sensible default values
# Append after 'multires_coupling' in configuration.nml
source = self.get_setting_value(
config, ["file:configuration.nml", "source"]
)
source = re.sub(
r"(namelist:multires_coupling)",
r"namelist:multires_coupling)" + "\n" + " (namelist:nudging",
source,
)
self.change_setting_value(
config, ["file:configuration.nml", "source"], source
)
self.add_setting(config, ["namelist:nudging"])
self.add_setting(
config, ["namelist:nudging", "nudge_data_levels"], "137"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_bottom"], "5"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_top"], "52"
)
self.add_setting(
config, ["namelist:nudging", "nudging_source"], "'era'"
)
self.add_setting(
config, ["namelist:nudging", "nudging_width_bottom"], "1"
)
self.add_setting(config, ["namelist:nudging", "nudging_width_top"], "0")

return config, self.reports
Original file line number Diff line number Diff line change
Expand Up @@ -880,3 +880,55 @@ def upgrade(self, config, meta_config=None):
)

return config, self.reports


class vn31_t474(MacroUpgrade):
"""Upgrade macro for ticket #474 by Mohit Dalvi."""

BEFORE_TAG = "vn3.1_t401"
AFTER_TAG = "vn3.1_t474"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-gungho
self.add_setting(config, ["namelist:files", "nudging_directory"], "''")
self.add_setting(config, ["namelist:files", "nudging_filename"], "''")
self.add_setting(
config,
["namelist:multires_coupling", "coarse_nudging"],
".false.",
)
self.add_setting(
config, ["namelist:multires_coupling", "nudging_mesh_name"], "''"
)
# Add new nudging namelist -with sensible default values
# Append after 'multires_coupling' in configuration.nml
source = self.get_setting_value(
config, ["file:configuration.nml", "source"]
)
source = re.sub(
r"(namelist:multires_coupling)",
r"namelist:multires_coupling)" + "\n" + " (namelist:nudging",
source,
)
self.change_setting_value(
config, ["file:configuration.nml", "source"], source
)
self.add_setting(config, ["namelist:nudging"])
self.add_setting(
config, ["namelist:nudging", "nudge_data_levels"], "137"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_bottom"], "5"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_top"], "52"
)
self.add_setting(
config, ["namelist:nudging", "nudging_source"], "'era'"
)
self.add_setting(
config, ["namelist:nudging", "nudging_width_bottom"], "1"
)
self.add_setting(config, ["namelist:nudging", "nudging_width_top"], "0")

return config, self.reports
Original file line number Diff line number Diff line change
Expand Up @@ -880,3 +880,55 @@ def upgrade(self, config, meta_config=None):
)

return config, self.reports


class vn31_t474(MacroUpgrade):
"""Upgrade macro for ticket #474 by Mohit Dalvi."""

BEFORE_TAG = "vn3.1_t401"
AFTER_TAG = "vn3.1_t474"

def upgrade(self, config, meta_config=None):
# Commands From: rose-meta/lfric-gungho
self.add_setting(config, ["namelist:files", "nudging_directory"], "''")
self.add_setting(config, ["namelist:files", "nudging_filename"], "''")
self.add_setting(
config,
["namelist:multires_coupling", "coarse_nudging"],
".false.",
)
self.add_setting(
config, ["namelist:multires_coupling", "nudging_mesh_name"], "''"
)
# Add new nudging namelist -with sensible default values
# Append after 'multires_coupling' in configuration.nml
source = self.get_setting_value(
config, ["file:configuration.nml", "source"]
)
source = re.sub(
r"(namelist:multires_coupling)",
r"namelist:multires_coupling)" + "\n" + " (namelist:nudging",
source,
)
self.change_setting_value(
config, ["file:configuration.nml", "source"], source
)
self.add_setting(config, ["namelist:nudging"])
self.add_setting(
config, ["namelist:nudging", "nudge_data_levels"], "137"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_bottom"], "5"
)
self.add_setting(
config, ["namelist:nudging", "nudging_level_top"], "52"
)
self.add_setting(
config, ["namelist:nudging", "nudging_source"], "'era'"
)
self.add_setting(
config, ["namelist:nudging", "nudging_width_bottom"], "1"
)
self.add_setting(config, ["namelist:nudging", "nudging_width_top"], "0")

return config, self.reports
Loading
Loading