Skip to content

Add mizuRoute #920

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
Draft
ekluzek wants to merge 84 commits into
base: master
Choose a base branch
from
Draft

Add mizuRoute #920

ekluzek wants to merge 84 commits into from
+177 −17

Conversation

@ekluzek
Copy link
Collaborator

@ekluzek ekluzek commented Feb 7, 2020 •
edited
Loading

Description of changes

Start bringing in mizuRoute as a submodule and a compset that will exercise it. As well as a few tests for it.

Specific notes

Contributors other than yourself, if any: @serbinsh nmizukami

CTSM Issues Fixed (include github issue #):

Are answers expected to change (and if so in what way)? No (unless running with mizuRoute)

Any User Interface Changes (namelist or namelist defaults changes)? New compsets

Testing performed, if any:
Individual tests with mizuRoute at several different resolutions have been tested

@ekluzek ekluzek added enhancement new capability or improved behavior of existing capability PR status: work in progress labels Feb 7, 2020
@ekluzek ekluzek self-assigned this Feb 7, 2020
@ekluzek ekluzek mentioned this pull request Feb 7, 2020
Merged
@ekluzek
Copy link
Collaborator Author

ekluzek commented Mar 21, 2020

There's at least one change needed in CMEPS. ESCOMP/CMEPS#57

@ekluzek
Copy link
Collaborator Author

ekluzek commented Mar 21, 2020

At this point the test case will build and link, and fails midway in initialization.

SMS_D_Vnuopc.f09_g17.I2000Clm50SpMizGs.cheyenne_intel.mizuroute-default

@ekluzek
Copy link
Collaborator Author

ekluzek commented Apr 18, 2020

We have more progress with running with a MOSART mesh with no ocean. It initializes and runs a single time step. There are changes in: cime, CMEPS, ctsm, and mizuRoute to make that happen.

@ekluzek ekluzek marked this pull request as draft June 4, 2020 22:42
@wwieder wwieder mentioned this pull request Nov 17, 2020
Open
ekluzek added 17 commits November 18, 2020 14:35
@ekluzek
Merge branch 'mvertens/feature/nuopc_updates' into add_mizuRoute
ffe7a67 
 Conflicts:
	Externals.cfg
	Externals_cime.cfg
@ekluzek
Update RTM and MOSART to version with nuopc updates in them, make sur…
1d1c925 
…e we are pointing to the cime branch needed to work with mizuRoute
@ekluzek
Merge tag 'ctsm5.1.dev035' into add_mizuRoute
3764f91 
Misc bfb enhancements and fixes

(1) If CISM is running over Antarctica, use virtual glacier columns over
    Antarctica

(2) Remove "mec" from some glacier/ice variable names (it is misleading
    to have "mec" in variable names when the ice landunit can actually
    have multiple columns *or* a single column) (ESCOMP#1294)

(3) Add history file metadata on each variable's l2g_scale_type (adds a
    landunit_mask attribute) (ESCOMP#1343)

(4) Use python3 in more shebang lines - needed to run python unit tests
    on cheyenne

(5) New compset naming for IG compsets (ESCOMP#1289)

(6) Remove calculation of fun_cost_fix that is overwritten
    (ESCOMP#1115)

(7) Bypass grid-level water mass check when fates hydro is active
    (ESCOMP#1334)

(8) Remove some dead code (ESCOMP#1333)

 Conflicts:
	Externals.cfg
	Externals_cime.cfg
@ekluzek
Change cime to a hash rather than the branch
9ae48dc
@ekluzek
Update cime hash on branch
8e4dc7a
@ekluzek
Merge tag 'ctsm5.1.dev049' into add_mizuRoute
df2b0bd 
Move the NEON_NIWO test to NEON/NIWO to match the names in usermods. Output particular fields for the NEON
cases, and use a reduced size dataset for lightning for NEON sites. Update NEON surface datasets with
new scripts included here. Fix stop option for NUOPC. NEON NIWO test in testlist explicity uses the user-mod
as well as the defaults testmod.

This script is for modifying the surface dataset at neon sites using data available from the neon server.

Also add the ability to output history fields for a particular time of day (in seconds) with the LXXXXX
history averaging option from Ronny Meier.

Externals are updated extensively to the version with cpl7 cime directories split out for CESM.

 Conflicts:
	Externals.cfg
@ekluzek
Update hash for cime along the branch
70bdf0c
@ekluzek
Update cime hash with one that has half degree hcru aliases for mizuR…
ac95861 
…oute
@ekluzek
Merge tag 'ctsm5.1.dev057' into add_mizuRoute
8cf85c0 
Consolidate duplicated crop phenology code

 Conflicts:
	Externals.cfg
@ekluzek
Merge remote-tracking branch 'ekluzek/nuopc_default' into add_mizuRoute
f0b33a7 
 Conflicts:
	Externals.cfg
@ekluzek
Update cime hash
79a0241
@ekluzek
Merge remote-tracking branch 'ekluzek/nuopc_default' into add_mizuRoute
5486792 
 Conflicts:
	Externals.cfg
@ekluzek
Add half degree PE layout
e8ef0a5
@ekluzek
Update repo to ESCOMP
da18e65
@ekluzek
Also include the mizuRoute expected fails list
58724b7
@ekluzek
Add some Nldas compsets for mizuRoute and add 5x5_amazon PE layouts f…
0d33dd7 
…or mizuRoute that run on more processors for mizuRoute
@ekluzek
Merge tag 'ctsm5.1.dev069' into add_mizuRoute
4b414c5 
Implement dynamic (transient) urban capability

This implements the capability to run transient simulations with changes
in urban density types. However, see Caveats for users section below.
If transient urban is activated (do_transient_urban=.true.) and an
appropriate landuse dataset is provided, the model will read in
yearly PCT_URBAN for three density types from the landuse dataset and
adjust other landunits accordingly.
Water and energy are conserved for these transitions. Urban landunits
do not account for carbon and nitrogen, however, see the dynamic urban
design document (doc/design/dynamic_urban.rst) for a discussion of this.

 Conflicts:
	cime_config/config_pes.xml
ekluzek added 7 commits January 8, 2024 00:34
@ekluzek
Merge tag 'ctsm5.1.dev157' into add_mizuRoute
2c08f56 
Update Externals.cfg to work on Derecho

 Conflicts:
	Externals.cfg
@ekluzek
Update externals to be based off of cesm2_3_alpha16a
93b5f2b
@ekluzek
Update externals, if ccs_config is updated to ccs_config_cesm0.0.74 i…
14b6abb 
…t fails on izumi, because of the updated ESMF version
@ekluzek
Update externals
c4e2dd3
@ekluzek
Merge tag 'ctsm5.1.dev167' into add_mizuRoute
db36b3b 
Delete history and spurious _FillValue from parameter files

 Conflicts:
	Externals.cfg
	cime_config/config_pes.xml
@ekluzek
Update hashes/tags for cmeps and ccs_config externals
5470557
@ekluzek
cime and cpl7 wasn't pointing to the right versions, this now matches…
14a47cf 
… ctsm5.1.dev167
@samsrabin samsrabin added science Enhancement to or bug impacting science and removed enh - new science labels Aug 8, 2024
@ekluzek
Merge tag 'ctsm5.2.023' into add_mizuRoute
89b3a4c 
Merge b4b-dev

Update .gitmodule to have branch for ccs_config and older
verison of mizuRoute that has baselines.

Update ccs_config for Derecho to point to esmf-8.6.1b04 so that
mizuRoute can run with the older files.

 Conflicts:
	Externals.cfg --> changed to .gitmodules
                 (also had a branch for cmeps that came to main)
	bld/namelist_files/namelist_defaults_ctsm.xml
	bld/unit_testers/build-namelist_test.pl
	cime_config/config_pes.xml
@ekluzek ekluzek added this to the CESM3 Answer changing freeze milestone Sep 27, 2024
@ekluzek ekluzek removed the size: large Large project that will take a few weeks or more label Dec 18, 2024
@ekluzek ekluzek moved this from In Progress to Todo in LMWG: Sprint Planning Board Mar 4, 2025
@ekluzek ekluzek moved this from Todo to In Progress in LMWG: Sprint Planning Board Mar 4, 2025
ekluzek added 3 commits March 14, 2025 13:23
@ekluzek
Merge tag 'ctsm5.3.031' into add_mizuRoute
7bee5bd 
Merge b4b-dev 20250313

PR ESCOMP#3013

 Conflicts:
	.gitmodules
	bld/unit_testers/build-namelist_test.pl
	ccs_config
	parse_cime.cs.status
@ekluzek
Correct namelist tester to just be ctsm5.3.031
b3a376e
@ekluzek
Update mizuRoute compsets to Clm60
7acd574
ekluzek
ekluzek commented Mar 14, 2025
View reviewed changes
cime_config/config_compsets.xml Outdated
<lname>2000_DATM%NLDAS2_CLM60%SP_SICE_SOCN_MIZUROUTE_SGLC_SWAV</lname>
</compset>

<compset>
Copy link
Collaborator Author

@ekluzek ekluzek Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll remove this one. It can still be done with long compset names for a case.

@ekluzek ekluzek moved this from In Progress to Todo in LMWG: Sprint Planning Board Apr 29, 2025
@nmizukami
Merge tag 'ctsm5.4.008' into add_mizuRoute
e869b2b 
Add a correction for oversaturated soil layers

Add a correction for oversaturated soil layers immediately after the soil water flux calculation in SoilWaterMovementMod.

 Conflicts:
	.gitmodules
	ccs_config
@wwieder
Copy link
Contributor

wwieder commented Jan 22, 2026

Let's get this done! Low lift for a supported feature in the release.

  • @ekluzek will bring in most of this PR into b4b dev (back out the CCS_config part of the PR).
  • @samsrabin requests this PR includes documentation in the users guide and tech note (link to existing resources is OK).
  • Create a remaining issue: get mizuRoute testlist working, which requires ccs_config updates
  • Make sure there's at least one CLM test for mizuRoute

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@ekluzek ekluzek

Labels

enhancement new capability or improved behavior of existing capability science Enhancement to or bug impacting science

Projects

CTSM-CLM6 development highlights
Status: Slow roast (incremental or external progress)
LMWG: Sprint Planning Board
Status: Todo

Milestone

ctsm6.0.0 (code freeze)

Development

Successfully merging this pull request may close these issues.

4 participants

@ekluzek @wwieder @samsrabin @nmizukami