Merge master 20240422 #2483
Merged
Merge master 20240422 #2483
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…dard scenarios, and add error checking for resolution and scenario
…list, mostly adding an ultra-hi-res option for non-crop present day
…ault, nor ultra-high res
…ault, nor ultra-high res
…ure crop datasets are used for all options if possible
…s do only one resolution so can fit in a reasonable time
…cenarios that put everything into one thing
…etland_iss1886 Resolved conflicts: python/ctsm/test/test_sys_fsurdat_modifier.py python/ctsm/test/testinputs/default_data.cfg python/ctsm/test/testinputs/modify_fsurdat_short.cfg
Distinguish between ocean and wetland in fsurdat files
…_makefile Conflicts: .git-blame-ignore-revs python/ctsm/modify_input_files/modify_fsurdat.py python/ctsm/test/test_sys_fsurdat_modifier.py python/ctsm/test/test_sys_mesh_modifier.py python/ctsm/test/test_unit_fsurdat_modifier.py python/ctsm/test/test_unit_subset_data.py tools/mksurfdata_esmf/src/mksurfdata.F90 tools/site_and_regional/default_data.cfg
…mentation for it, resolves ESCOMP#2180
… NEON server or file length issues
…t and needs to update to Clm60
Update ctsm5.2 branch to ctsm5.1.dev176 and some small updates
ctsm5.2.0 -- ctsm5.2.mksurfdata
New surface datasets and new mksurfdata_esmf tool to create them
Changes to CTSM:
================
All new surface datasets. Transient urban and lake by default turned on
for transient cases.
Ocean is run as baresoil rather than wetland (for clm6_0). The urban
streams file was also
updated. The new surface datasets have new updated input datasets (see
below).
Update the README files.
New surface datasets:
=====================
The new surface datasets are incompatible with previous versions (for
example the ctsm5.1 series)
ctsm5.2.0 and following versions also can NOT use the previous ctsm5.1
datasets.
See the section below about the new datasets used in their creation.
Improvements in how landunits
on coastal areas was also done.
The following fields were added and removed to the list of fields on the
datasets.
Fields added:
ORGC, BULK, CFRAG, PHAQ (soil data) (currently NOT used by CTSM)
mapunits (map units from the soil dataset)
LANDFRAC_MKSURFDATA (for reference NOT used by CTSM)
PCT_OCEAN (previously PCT_WETLAND was used)
Fields removed:
AREA, PFTDATA_MASK
New mksurfdata_esmf Tool:
=========================
Implement a parallel version of mksurfdata (mksurfdata_esmf) that uses
ESMF regridding directly
in mksurfdata so that offline mapping files don't have to be created as
a separate step. This
allows mksurfdata to create surface datasets at much higher resolutions
The build for the tool is based on the CESM/CIME build system and uses
cmake. This allows the build
to be kept up with changes in CESM. Currently it's only setup and
working on Derecho. But, this design
will enable it to be built and run on any CESM supported machine (or a
machine that a user ports to).
Any input grid from ccs_config can be used, or the user can supply their
own mesh file to define
the output grid. The user no longer has to add to the list of valid
resolutions as in mksurfdata_map.
Creation of supported single point datasets. These datasets are created
through the use of subset_data.
Test datasets for dynUrban, dynLake, and dynPFT is done with a simple
NCO script.
All datasets can be easily made by running "make all" in the
tools/mksurfdata_esmf directory.
For instructions see:
tools/mksurfdata_esmf/README.md
New input datasets to mksurfdata_esmf:
======================================
New soil dataset: ISRIC/WISE dataset Batjes (2016)
https://doi.org/10.1016/j.geoderma.2016.01.034
New PFT, soil-color, LAI dataset: Created by Lawrence P.J. 2022
New Glacier datasets: Glacier outlines from RGI version 6 (Arendt et
al., 2017).
vector data for GrIS and AIS retrieved from BedMachine version 4 and
version 2 (Morlighem et al., 2017, 2020), respectively.
30-arcsec topography/land mask retrieved GMTED2010 (Danielson and
Gesch, 2011).
New urban datasets: Gao and O'Neill (2021) and Gao and Pesaresi (2022),
Oleson and Feddema (2020)
New lake datasets: HydroLake: Messager et. al. (2016)
Conflicts:
cime_config/usermods_dirs/NEON/defaults/user_nl_clm
Merge b4bdev 20240420
Merge b4b-dev Some fixes for run_neon that came up in ctsm5.1.dev172. Small bug fix for units of vector format hillslope hydrology. Start adding PLUMBER2 users-mods (NOT functional)
ekluzek
requested review from
samsrabin,
adrifoster,
wwieder and
slevis-lmwg
and removed request for
samsrabin
samsrabin
approved these changes
Apr 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Merge master to b4b-dev