Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: alperaltuntas/CESM
ref: cesm3_0_beta06_gui
ref: cesm3_0_beta08_gui
path: CESM
#submodules: recursive

Expand Down
6 changes: 3 additions & 3 deletions docs/installation.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Installation
======================================

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

Prerequisite
Expand Down Expand Up @@ -31,8 +31,8 @@ CESM may take some time.

.. code-block:: bash

git clone https://github.com/alperaltuntas/cesm.git -b cesm3_0_beta06_gui cesm3_0_beta06_gui
cd cesm3_0_beta06_gui
git clone https://github.com/alperaltuntas/cesm.git -b cesm3_0_beta08_gui cesm3_0_beta08_gui
cd cesm3_0_beta08_gui
./bin/git-fleximod update

This will download the required CESM version, including visualCaseGen.
Expand Down
2 changes: 1 addition & 1 deletion docs/open.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ To access the GUI on a remote machine, set up SSH tunneling with port forwarding
.. code-block:: bash

conda activate visualCaseGen
cd [PATH_TO_visualCaseGen] # e.g., ~/cesm3_0_beta03_gui/visualCaseGen
cd [PATH_TO_visualCaseGen] # e.g., ~/cesm3_0_beta08_gui/visualCaseGen
jupyter-lab GUI.ipynb --no-browser

If the above steps are successful, the command line will display a URL that you can copy and paste into your web browser
Expand Down
2 changes: 1 addition & 1 deletion tests/2_integration/test_standard_compset.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def configure_standard_compset(cime):
cvars[f"COMP_{comp_class}_FILTER"].value = "any"

## Pick a standard compset
cvars['COMPSET_ALIAS'].value = "BLT1850"
cvars['COMPSET_ALIAS'].value = "B1850C_LTso"

# Generate standard grids list (but don't select any yet)
cvars['GRID_MODE'].value = 'Standard'
Expand Down
8 changes: 4 additions & 4 deletions tests/3_system/test_f2000_custom_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ def construct_custom_f2000_compset():
cvars["COMP_ROF_OPTION"].value = "(none)"
cvars["COMP_GLC_OPTION"].value = "NOEVOLVE"

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

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

## Pick a standard compset
cvars["COMPSET_ALIAS"].value = "BLT1850"
cvars["COMPSET_ALIAS"].value = "B1850C_LTso"


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

construct_standard_blt1850(cime)
construct_standard_b1850(cime)
construct_custom_res_from_new_mom6_grid_modified_clm_grid(cime)

if __name__ == "__main__":
Expand Down
3 changes: 3 additions & 0 deletions visualCaseGen/custom_widget_types/clm_modifier_launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ def _write_config(self, config_file_path, modified_file_path):
f'lon_dimname = {cvars["LON_DIM_NAME"].value}\n'
f'lat_varname = {cvars["LAT_VAR_NAME"].value}\n'
f'lon_varname = {cvars["LON_VAR_NAME"].value}\n'
f'lon_type = 360\n'
)


Expand Down Expand Up @@ -281,6 +282,7 @@ def _write_config(self, config_file_path, modified_file_path):
f"lnd_lon_1 = {coords[2]}\n"
f"lnd_lon_2 = {coords[3]}\n"
f'landmask_file = UNSET\n'
f'lon_type = 360\n'
)
elif cvars["FSURDAT_AREA_SPEC"].value.startswith("mask_file:"):
f.write(
Expand All @@ -289,6 +291,7 @@ def _write_config(self, config_file_path, modified_file_path):
f"lnd_lon_1 = 0.0\n"
f"lnd_lon_2 = 360.0\n"
f'landmask_file = {cvars["FSURDAT_AREA_SPEC"].value[10:]}\n'
f'lon_type = 360\n'
)
else:
raise ValueError("Invalid FSURDAT_AREA_SPEC value")
Expand Down
4 changes: 2 additions & 2 deletions visualCaseGen/custom_widget_types/fsurdat_area_specifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ def __init__(self, value=None, disabled=False, **kwargs):
style={"description_width": "260px"},
)
self._west = BoundedFloatText(
value=0.0, min=-360.0, max=360.0,
value=0.0, min=0.0, max=360.0,
description="Westernmost longitude for rectangle:",
layout={"display": "none", "width": "350px", "margin": "5px"},
style={"description_width": "260px"},
)
self._east = BoundedFloatText(
value=360.0, min=-360.0, max=360.0,
value=360.0, min=-0.0, max=360.0,
description="Easternmost longitude for rectangle:",
layout={"display": "none", "width": "350px", "margin": "5px"},
style={"description_width": "260px"},
Expand Down
Loading