Skip to content

Commit 12b14c5

Browse files
jennyhicksonjames-bruten-mo
jennyhickson
and
james-bruten-mo
authored
Pre release vn3.0 (#174)
Co-authored-by: James Bruten <james.bruten@metoffice.gov.uk>
1 parent 8756453 commit 12b14c5

45 files changed

Lines changed: 2369 additions & 341 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CONTRIBUTORS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
| GitHub user | Real Name | Affiliation | Date |
44
| ----------- | --------- | ----------- | ---- |
55
| james-bruten-mo | James Bruten | Met Office | 2025-12-09 |
6+
| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 |

‎applications/coupled/rose-meta/lfric-coupled/version22_30.py‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
import sys
2+
3+
from metomi.rose.upgrade import MacroUpgrade
4+
5+
from .version21_22 import *
6+
7+
8+
class UpgradeError(Exception):
9+
"""Exception created when an upgrade fails."""
10+
11+
def __init__(self, msg):
12+
self.msg = msg
13+
14+
def __repr__(self):
15+
sys.tracebacklimit = 0
16+
return self.msg
17+
18+
__str__ = __repr__
19+
20+
21+
"""
22+
Copy this template and complete to add your macro
23+
class vnXX_txxx(MacroUpgrade):
24+
# Upgrade macro for <TICKET> by <Author>
25+
BEFORE_TAG = "vnX.X"
26+
AFTER_TAG = "vnX.X_txxx"
27+
def upgrade(self, config, meta_config=None):
28+
# Add settings
29+
return config, self.reports
30+
"""
31+
32+
33+
class vn22_t4661(MacroUpgrade):
34+
"""Upgrade macro for ticket #4661 by Denis Sergeev."""
35+
36+
BEFORE_TAG = "vn2.2"
37+
AFTER_TAG = "vn2.2_t4661"
38+
39+
def upgrade(self, config, meta_config=None):
40+
# Commands From: rose-meta/lfric-driver
41+
self.add_setting(config, ["namelist:extrusion", "eta_values"], "''")
42+
return config, self.reports
43+
44+
45+
class vn22_t4020(MacroUpgrade):
46+
"""Upgrade macro for ticket #4020 by Andrew Coughtrie."""
47+
48+
BEFORE_TAG = "vn2.2_t4661"
49+
AFTER_TAG = "vn2.2_t4020"
50+
51+
def upgrade(self, config, meta_config=None):
52+
# Commands From: rose-meta/lfric-driver
53+
self.add_setting(
54+
config, ["namelist:io", "end_of_run_checkpoint"], ".true."
55+
)
56+
self.add_setting(config, ["namelist:io", "checkpoint_times"], "")
57+
return config, self.reports
58+
59+
60+
class vn22_t34(MacroUpgrade):
61+
"""Upgrade macro for ticket TTTT by Unknown."""
62+
63+
BEFORE_TAG = "vn2.2_t4020"
64+
AFTER_TAG = "vn3.0"
65+
66+
def upgrade(self, config, meta_config=None):
67+
# Commands From: rose-meta/lfric-driver
68+
# Blank Upgrade Macro
69+
# Commands From: rose-meta/lfric-coupled
70+
# Blank Upgrade Macro
71+
return config, self.reports

‎applications/coupled/rose-meta/lfric-coupled/versions.py‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from metomi.rose.upgrade import MacroUpgrade
44

5-
from .version21_22 import *
5+
from .version22_30 import *
66

77

88
class UpgradeError(Exception):
@@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None):
3131
# Add settings
3232
return config, self.reports
3333
"""
34-
35-
36-
class vn22_t4661(MacroUpgrade):
37-
"""Upgrade macro for ticket #4661 by Denis Sergeev."""
38-
39-
BEFORE_TAG = "vn2.2"
40-
AFTER_TAG = "vn2.2_t4661"
41-
42-
def upgrade(self, config, meta_config=None):
43-
# Commands From: rose-meta/lfric-driver
44-
self.add_setting(config, ["namelist:extrusion", "eta_values"], "''")
45-
46-
return config, self.reports
47-
48-
49-
class vn22_t4020(MacroUpgrade):
50-
"""Upgrade macro for ticket #4020 by Andrew Coughtrie."""
51-
52-
BEFORE_TAG = "vn2.2_t4661"
53-
AFTER_TAG = "vn2.2_t4020"
54-
55-
def upgrade(self, config, meta_config=None):
56-
# Commands From: rose-meta/lfric-driver
57-
self.add_setting(
58-
config, ["namelist:io", "end_of_run_checkpoint"], ".true."
59-
)
60-
self.add_setting(config, ["namelist:io", "checkpoint_times"], "")
61-
62-
return config, self.reports

‎applications/coupled/rose-meta/lfric-coupled/vn3.0/rose-meta.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import=lfric-driver/vn3.0

‎applications/io_demo/rose-meta/lfric-io_demo/version22_30.py‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
import sys
2+
3+
from metomi.rose.upgrade import MacroUpgrade
4+
5+
from .version21_22 import *
6+
7+
8+
class UpgradeError(Exception):
9+
"""Exception created when an upgrade fails."""
10+
11+
def __init__(self, msg):
12+
self.msg = msg
13+
14+
def __repr__(self):
15+
sys.tracebacklimit = 0
16+
return self.msg
17+
18+
__str__ = __repr__
19+
20+
21+
"""
22+
Copy this template and complete to add your macro
23+
class vnXX_txxx(MacroUpgrade):
24+
# Upgrade macro for <TICKET> by <Author>
25+
BEFORE_TAG = "vnX.X"
26+
AFTER_TAG = "vnX.X_txxx"
27+
def upgrade(self, config, meta_config=None):
28+
# Add settings
29+
return config, self.reports
30+
"""
31+
32+
33+
class vn22_t4661(MacroUpgrade):
34+
"""Upgrade macro for ticket #4661 by Denis Sergeev."""
35+
36+
BEFORE_TAG = "vn2.2"
37+
AFTER_TAG = "vn2.2_t4661"
38+
39+
def upgrade(self, config, meta_config=None):
40+
# Commands From: rose-meta/lfric-driver
41+
self.add_setting(config, ["namelist:extrusion", "eta_values"], "''")
42+
return config, self.reports
43+
44+
45+
class vn22_t4020(MacroUpgrade):
46+
"""Upgrade macro for ticket #4020 by Andrew Coughtrie."""
47+
48+
BEFORE_TAG = "vn2.2_t4661"
49+
AFTER_TAG = "vn2.2_t4020"
50+
51+
def upgrade(self, config, meta_config=None):
52+
# Commands From: rose-meta/lfric-driver
53+
self.add_setting(
54+
config, ["namelist:io", "end_of_run_checkpoint"], ".true."
55+
)
56+
self.add_setting(config, ["namelist:io", "checkpoint_times"], "")
57+
return config, self.reports
58+
59+
60+
class vn22_t34(MacroUpgrade):
61+
"""Upgrade macro for ticket TTTT by Unknown."""
62+
63+
BEFORE_TAG = "vn2.2_t4020"
64+
AFTER_TAG = "vn3.0"
65+
66+
def upgrade(self, config, meta_config=None):
67+
# Commands From: rose-meta/lfric-driver
68+
# Blank Upgrade Macro
69+
# Commands From: rose-meta/lfric-io_demo
70+
# Blank Upgrade Macro
71+
return config, self.reports

‎applications/io_demo/rose-meta/lfric-io_demo/versions.py‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from metomi.rose.upgrade import MacroUpgrade
44

5-
from .version21_22 import *
5+
from .version22_30 import *
66

77

88
class UpgradeError(Exception):
@@ -31,32 +31,3 @@ def upgrade(self, config, meta_config=None):
3131
# Add settings
3232
return config, self.reports
3333
"""
34-
35-
36-
class vn22_t4661(MacroUpgrade):
37-
"""Upgrade macro for ticket #4661 by Denis Sergeev."""
38-
39-
BEFORE_TAG = "vn2.2"
40-
AFTER_TAG = "vn2.2_t4661"
41-
42-
def upgrade(self, config, meta_config=None):
43-
# Commands From: rose-meta/lfric-driver
44-
self.add_setting(config, ["namelist:extrusion", "eta_values"], "''")
45-
46-
return config, self.reports
47-
48-
49-
class vn22_t4020(MacroUpgrade):
50-
"""Upgrade macro for ticket #4020 by Andrew Coughtrie."""
51-
52-
BEFORE_TAG = "vn2.2_t4661"
53-
AFTER_TAG = "vn2.2_t4020"
54-
55-
def upgrade(self, config, meta_config=None):
56-
# Commands From: rose-meta/lfric-driver
57-
self.add_setting(
58-
config, ["namelist:io", "end_of_run_checkpoint"], ".true."
59-
)
60-
self.add_setting(config, ["namelist:io", "checkpoint_times"], "")
61-
62-
return config, self.reports

‎applications/io_demo/rose-meta/lfric-io_demo/vn3.0/rose-meta.conf‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import=lfric-driver/vn3.0
2+
3+
[namelist:io=multifile_io]
4+
compulsory=true
5+
description=Use multifile_io functionality
6+
help=This is used to turn the multifile_io functionality in the io_demo app
7+
=on and off
8+
!kind=default
9+
type=logical
10+
11+
[namelist:multifile_io]
12+
compulsory=false
13+
duplicate=true
14+
!instance_key_member=filename
15+
16+
[namelist:multifile_io=filename]
17+
compulsory=true
18+
!kind=default
19+
type=character
20+
21+
[namelist:multifile_io=start_timestep]
22+
compulsory=true
23+
!kind=default
24+
type=integer
25+
26+
[namelist:multifile_io=stop_timestep]
27+
compulsory=true
28+
!kind=default
29+
type=integer

‎applications/lbc_demo/rose-meta/lfric-lbc_demo/version22_30.py‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import sys
2+
from metomi.rose.upgrade import MacroUpgrade
3+
4+
class UpgradeError(Exception):
5+
"""Exception created when an upgrade fails."""
6+
7+
def __init__(self, msg):
8+
self.msg = msg
9+
10+
def __repr__(self):
11+
sys.tracebacklimit = 0
12+
return self.msg
13+
14+
__str__ = __repr__
15+
16+
"""
17+
Copy this template and complete to add your macro
18+
19+
class vnXX_txxx(MacroUpgrade):
20+
# Upgrade macro for <TICKET> by <Author>
21+
22+
BEFORE_TAG = "vnX.X"
23+
AFTER_TAG = "vnX.X_txxx"
24+
25+
def upgrade(self, config, meta_config=None):
26+
# Add settings
27+
return config, self.reports
28+
"""
29+
30+
class vn22_t4231(MacroUpgrade):
31+
# Upgrade macro for #4231 by Ricky Wong
32+
# Ticket #4231 adds a new application, "lbc_demo"
33+
# This ugrade macro does nothing but set the
34+
# appropriate "After_tag"
35+
36+
BEFORE_TAG = "vn2.2"
37+
AFTER_TAG = "vn2.2_t4231"
38+
39+
def upgrade(self, config, meta_config=None):
40+
# Add settings
41+
return config, self.reports
42+
"""
43+
44+
45+
class vn22_t34(MacroUpgrade):
46+
# Upgrade macro for 34 by jennifer hickson
47+
48+
BEFORE_TAG = "vn2.2_t4231"
49+
AFTER_TAG = "vn3.0"
50+
51+
def upgrade(self, config, meta_config=None):
52+
return config, self.reports

‎applications/lbc_demo/rose-meta/lfric-lbc_demo/versions.py‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import sys
2+
23
from metomi.rose.upgrade import MacroUpgrade
34

5+
from .version22_30 import *
6+
7+
48
class UpgradeError(Exception):
59
"""Exception created when an upgrade fails."""
610

@@ -13,6 +17,7 @@ def __repr__(self):
1317

1418
__str__ = __repr__
1519

20+
1621
"""
1722
Copy this template and complete to add your macro
1823
@@ -26,17 +31,3 @@ def upgrade(self, config, meta_config=None):
2631
# Add settings
2732
return config, self.reports
2833
"""
29-
30-
class vn22_t4231(MacroUpgrade):
31-
# Upgrade macro for #4231 by Ricky Wong
32-
# Ticket #4231 adds a new application, "lbc_demo"
33-
# This ugrade macro does nothing but set the
34-
# appropriate "After_tag"
35-
36-
BEFORE_TAG = "vn2.2"
37-
AFTER_TAG = "vn2.2_t4231"
38-
39-
def upgrade(self, config, meta_config=None):
40-
# Add settings
41-
return config, self.reports
42-
"""

‎applications/lbc_demo/rose-meta/lfric-lbc_demo/vn3.0/rose-meta.conf‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import=lfric-driver/vn3.0
2+
3+
[namelist:lbc_demo]
4+
compulsory=true
5+
6+
[namelist:lbc_demo=apply_lbc]
7+
compulsory=true
8+
!kind=default
9+
type=logical
10+
11+
[namelist:lbc_demo=enable_lbc]
12+
compulsory=true
13+
!kind=default
14+
type=logical
15+
16+
[namelist:lbc_demo=field_type]
17+
compulsory=true
18+
!enumeration=true
19+
value-titles='Real','Integer'
20+
values='real','integer'
21+
22+
[namelist:lbc_demo=lbc_source]
23+
compulsory=true
24+
!enumeration=true
25+
value-titles='File','Analytic'
26+
values='file','analytic'
27+
28+
[namelist:lbc_demo=read_lbc]
29+
compulsory=true
30+
!kind=default
31+
type=logical
32+
33+
[namelist:lbc_demo=set_lbc]
34+
compulsory=true
35+
!enumeration=true
36+
value-titles='Constant','Quadrant'
37+
values='constant','quadrant'
38+
39+
[namelist:lbc_demo=write_lbc]
40+
compulsory=true
41+
!kind=default
42+
type=logical

0 commit comments

Comments
 (0)