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.

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

Update CDEPS to include the latest changes from ESCOMP/CDEPS #45

Merged
merged 37 commits into from
Apr 29, 2022

Conversation

binli2337
Copy link
Collaborator

@binli2337 binli2337 commented Mar 18, 2022

Description of changes

The master branch of ESCOMP/CDEPS has been updated. The develop branch of NOAA-EMC/CDEPS will be updated to include the latest changes from ESCOMP/CDEPS.

Specific notes

CDEPS Issues Fixed #44

Testing performed:

uturuncoglu and others added 30 commits September 1, 2021 16:23
The argument order differs for the cdeps library vs. the individual
components. Thus, we need a different function to parse the command line
for the library. The new parse_command_line function is a direct copy of
the same function from buildlib.csm_share.

To handle this difference in command-line arguments in the two
situations, I have renamed the old file to buildlib_comps (which is
identical to the old buildlib); the individual data model components now
point to that file, leaving buildlib just being used for the cdeps
shared library.

In a following commit I will remove unnecessary code from each of these
files.

Resolves ESCOMP#104
It turns out that, for the most part, each line of code was just needed
for one of these, not both. So, now that the unnecessary code is removed
from each, there is essentially no duplication between buildlib and
buildlib_comps.
Allow none mapalgo. For single-point runs of CTSM, we need to be able to set `foo:mapalgo=none` , where `foo` is the stream name.  `none` as an option to `cime_config/stream_cdeps.py`
Fix for ESMF config file for multiple stream
Description of changes

Add SRCROOT to cmake flags - this is needed for nag.cmake
Description of changes

Changed all references from master_task to main_task and from masterproc to mainproc
Specific notes

Also added comments to each user_nl_xxx_streams to describe how to add user changes across multiple lines. Also simplified future PR templates.

Contributors other than yourself, if any: None

CDEPS Issues Fixed: None

Are there dependencies on other component PRs: No

Are changes expected to change answers? No

Any User Interface Changes (namelist or namelist defaults changes)? No

Testing performed: (e.g. aux_cdeps, cesm_prealpha, etc)
Ran cesm prealpha tests using cesm2_3_beta07 and compared answers relative to cesm2_3_alpha07d

Hashes used for testing:
cesm2_3_beta07 plus this branch
Description of changes

Updates download path for NEON data, the new path is a virtual address so in the future the
actual location of the server can be updated without further changes here.
Specific notes

Contributors other than yourself, if any:

CDEPS Issues Fixed (include github issue #):

Are there dependencies on other component PRs

CIME (list) 479181641

    CMEPS (list)

Are changes expected to change answers?

bit for bit
different at roundoff level

    more substantial

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

Yes

    No

Testing performed: Hand tested NEON cases.

(required) aux_cdeps

    machines and compilers:
    details (e.g. failed tests):

    (optional) CESM prealpha test
        machines and compilers
        details (e.g. failed tests):

Hashes used for testing:

CIME

    repository to check out: ESCOMP/CESM.git
    branch:
    hash:

CMEPS

    repository to check out: ESCOMP/CESM.git
    branch:
    hash:

    CESM
        repository to check out: ESCOMP/CESM.git
        branch:
        hash:
…zenith_angle_correction"

This reverts commit 39f79b4, reversing
changes made to 4ebc156.
jedwards4b and others added 7 commits March 15, 2022 07:28
Revert PR ESCOMP#123

### Description of changes

PR ESCOMP#123 (solar zenith angle correction) led to exact restart failures in some situations: see ESCOMP#144. This PR backs out the changes from ESCOMP#123 .

### Specific notes

Contributors other than yourself, if any:

CDEPS Issues Fixed (include github issue #): Temporarily deals with ESCOMP#144.

Are there dependencies on other component PRs (if so list): no

Are changes expected to change answers (bfb, different to roundoff, more substantial): more substantial. I have verified that this brings answers back to being bfb with those in cdeps0.12.35 (i.e., prior to ESCOMP#123) via a run of the aux_clm test suite.

Any User Interface Changes (namelist or namelist defaults changes): no

Testing performed (e.g. aux_cdeps, CESM prealpha, etc): aux_clm

Hashes used for testing: billsacks/ctsm@3fd7f6fbf
update datm/datm_datamode_gfs_mod.F90
@binli2337 binli2337 merged commit f1ed1b8 into NOAA-EMC:develop Apr 29, 2022
@binli2337 binli2337 deleted the feature/update_cdeps branch June 20, 2022 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update CDEPS to include the latest changes from ESCOMP/CDEPS
7 participants