Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new BCS version #75

Merged
merged 4 commits into from
Jun 10, 2024
Merged

Add new BCS version #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75b0aaa
add v12 BCS option
biljanaorescanin Jun 7, 2024
e300eed
update log
biljanaorescanin Jun 7, 2024
58e2d3c
Update CI to use BCs v11.5.0
mathomp4 Jun 10, 2024
959d5dd
Use 7.23.0
mathomp4 Jun 10, 2024
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2.1

# Anchors in case we need to override the defaults from the orb
#baselibs_version: &baselibs_version v7.17.0
#bcs_version: &bcs_version v11.4.0
#baselibs_version: &baselibs_version v7.23.0
#bcs_version: &bcs_version v11.5.0

orbs:
ci: geos-esm/circleci-tools@2
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Added new BCS version v12

### Changed

- Move to use `time_ave_util.x` from MAPL instead of `time_ave.x`
Expand Down
4 changes: 2 additions & 2 deletions pre/remap_restart/remap_questions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,15 +266,15 @@ def ask_questions():
"name": "output:shared:bc_version",
"message": message_bc_other_new,
"choices": choices_bc_other,
"when": lambda x: x["output:shared:bc_version"] == 'Other' and x["input:shared:bc_version"] not in ['v06','v11'],
"when": lambda x: x["output:shared:bc_version"] == 'Other' and x["input:shared:bc_version"] not in ['v06','v11','v12'],
},

{
"type": "select",
"name": "output:shared:bc_version",
"message": "\nSelect BCs version for new restarts:\n",
"choices": choices_bc_other,
"when": lambda x: x["output:shared:bc_version"] == 'Other' and x["input:shared:bc_version"] in ['v06','v11'],
"when": lambda x: x["output:shared:bc_version"] == 'Other' and x["input:shared:bc_version"] in ['v06','v11','v12'],
},

{
Expand Down
7 changes: 4 additions & 3 deletions pre/remap_restart/remap_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@

choices_bc_ops = ['NL3', 'ICA', 'GM4', 'Other']

choices_bc_other = ['v06','v11']
choices_bc_other = ['v06','v11','v12']

choices_bc_cmd = ['NL3', 'ICA', 'GM4', 'v06', 'v11']
choices_bc_cmd = ['NL3', 'ICA', 'GM4', 'v06', 'v11','v12']

choices_omodel = ['data', 'MOM5', 'MOM6']

Expand Down Expand Up @@ -97,7 +97,8 @@
message_bc_other = f'''\n

v06: NL3 + JPL veg height + PEATMAP + MODIS snow alb\n
v11: NL3 + JPL veg height + PEATMAP + MODIS snow alb v2\n\n'''\
v11: NL3 + JPL veg height + PEATMAP + MODIS snow alb v2\n
v12: NL3 + JPL veg height + PEATMAP + MODIS snow alb v2 + Argentina peatland fix \n\n'''\

message_bc_other_in = ("Select BCs version of input restarts:\n" + message_bc_other)
message_bc_other_new = ("Select BCs version for new restarts:\n" + message_bc_other)
Expand Down
Loading