Skip to content

Commit aee5f90

Browse files
Update to CESM3 beta08 and address incompability issues (#38)
1 parent 254ab70 commit aee5f90

7 files changed

Lines changed: 15 additions & 12 deletions

File tree

.github/workflows/ci-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@v4
3737
with:
3838
repository: alperaltuntas/CESM
39-
ref: cesm3_0_beta06_gui
39+
ref: cesm3_0_beta08_gui
4040
path: CESM
4141
#submodules: recursive
4242

docs/installation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Installation
22
======================================
33

4-
visualCaseGen is presently bundled with a CESM distribution (fork) based on cesm3_0_beta06. The following
4+
visualCaseGen is presently bundled with a CESM distribution (fork) based on cesm3_0_beta08. The following
55
instructions guide you through obtaining and installing this specific CESM distribution with visualCaseGen.
66

77
Prerequisite
@@ -31,8 +31,8 @@ CESM may take some time.
3131

3232
.. code-block:: bash
3333
34-
git clone https://github.com/alperaltuntas/cesm.git -b cesm3_0_beta06_gui cesm3_0_beta06_gui
35-
cd cesm3_0_beta06_gui
34+
git clone https://github.com/alperaltuntas/cesm.git -b cesm3_0_beta08_gui cesm3_0_beta08_gui
35+
cd cesm3_0_beta08_gui
3636
./bin/git-fleximod update
3737
3838
This will download the required CESM version, including visualCaseGen.

docs/open.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To access the GUI on a remote machine, set up SSH tunneling with port forwarding
6464
.. code-block:: bash
6565
6666
conda activate visualCaseGen
67-
cd [PATH_TO_visualCaseGen] # e.g., ~/cesm3_0_beta03_gui/visualCaseGen
67+
cd [PATH_TO_visualCaseGen] # e.g., ~/cesm3_0_beta08_gui/visualCaseGen
6868
jupyter-lab GUI.ipynb --no-browser
6969
7070
If the above steps are successful, the command line will display a URL that you can copy and paste into your web browser

tests/2_integration/test_standard_compset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def configure_standard_compset(cime):
6161
cvars[f"COMP_{comp_class}_FILTER"].value = "any"
6262

6363
## Pick a standard compset
64-
cvars['COMPSET_ALIAS'].value = "BLT1850"
64+
cvars['COMPSET_ALIAS'].value = "B1850C_LTso"
6565

6666
# Generate standard grids list (but don't select any yet)
6767
cvars['GRID_MODE'].value = 'Standard'

tests/3_system/test_f2000_custom_grid.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ def construct_custom_f2000_compset():
106106
cvars["COMP_ROF_OPTION"].value = "(none)"
107107
cvars["COMP_GLC_OPTION"].value = "NOEVOLVE"
108108

109-
def construct_standard_blt1850(cime):
110-
"""Construct a standard BLT1850 case."""
109+
def construct_standard_b1850(cime):
110+
"""Construct a standard B1850C_LTso case."""
111111
assert os.path.exists(base_temp_dir), "temp testing directory does not exist"
112112

113113
# At initialization, the first stage should be enabled
@@ -131,7 +131,7 @@ def construct_standard_blt1850(cime):
131131
cvars[f"COMP_{comp_class}_FILTER"].value = "any"
132132

133133
## Pick a standard compset
134-
cvars["COMPSET_ALIAS"].value = "BLT1850"
134+
cvars["COMPSET_ALIAS"].value = "B1850C_LTso"
135135

136136

137137
def construct_custom_res_from_std_grids(cime):
@@ -444,7 +444,7 @@ def test_custom_f2000_new_mom6_grid_modified_clm_grid():
444444
if machine not in ["derecho", "casper"]:
445445
pytest.skip("This test is only for the derecho and casper machines")
446446

447-
construct_standard_blt1850(cime)
447+
construct_standard_b1850(cime)
448448
construct_custom_res_from_new_mom6_grid_modified_clm_grid(cime)
449449

450450
if __name__ == "__main__":

visualCaseGen/custom_widget_types/clm_modifier_launcher.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ def _write_config(self, config_file_path, modified_file_path):
225225
f'lon_dimname = {cvars["LON_DIM_NAME"].value}\n'
226226
f'lat_varname = {cvars["LAT_VAR_NAME"].value}\n'
227227
f'lon_varname = {cvars["LON_VAR_NAME"].value}\n'
228+
f'lon_type = 360\n'
228229
)
229230

230231

@@ -281,6 +282,7 @@ def _write_config(self, config_file_path, modified_file_path):
281282
f"lnd_lon_1 = {coords[2]}\n"
282283
f"lnd_lon_2 = {coords[3]}\n"
283284
f'landmask_file = UNSET\n'
285+
f'lon_type = 360\n'
284286
)
285287
elif cvars["FSURDAT_AREA_SPEC"].value.startswith("mask_file:"):
286288
f.write(
@@ -289,6 +291,7 @@ def _write_config(self, config_file_path, modified_file_path):
289291
f"lnd_lon_1 = 0.0\n"
290292
f"lnd_lon_2 = 360.0\n"
291293
f'landmask_file = {cvars["FSURDAT_AREA_SPEC"].value[10:]}\n'
294+
f'lon_type = 360\n'
292295
)
293296
else:
294297
raise ValueError("Invalid FSURDAT_AREA_SPEC value")

visualCaseGen/custom_widget_types/fsurdat_area_specifier.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ def __init__(self, value=None, disabled=False, **kwargs):
4040
style={"description_width": "260px"},
4141
)
4242
self._west = BoundedFloatText(
43-
value=0.0, min=-360.0, max=360.0,
43+
value=0.0, min=0.0, max=360.0,
4444
description="Westernmost longitude for rectangle:",
4545
layout={"display": "none", "width": "350px", "margin": "5px"},
4646
style={"description_width": "260px"},
4747
)
4848
self._east = BoundedFloatText(
49-
value=360.0, min=-360.0, max=360.0,
49+
value=360.0, min=-0.0, max=360.0,
5050
description="Easternmost longitude for rectangle:",
5151
layout={"display": "none", "width": "350px", "margin": "5px"},
5252
style={"description_width": "260px"},

0 commit comments

Comments
 (0)