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 #52

Merged
merged 132 commits into from
Feb 21, 2023

Conversation

binli2337
Copy link
Collaborator

Description of changes

Update CDEPS to include the latest changes from ESCOMP/CDEPS

Specific notes

Contributors other than yourself, if any:

CDEPS Issues Fixed: #51

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

Are changes expected to change answers: no

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

Testing performed: cdeps tests in ufs-weather-model

mvertens and others added 30 commits August 24, 2022 20:58
…drof, dwav (ESCOMP#180)

* add skip_restart functionality to all components that can use it
* initialize logunit

* cleanup stream logunit initialization

* remove unused variable logunit
Co-authored-by: Mariana Vertenstein <mvertens@ucar.edu>
Co-authored-by: Adrianna Foster <adrifost@ucar.edu>
correct mismatch of leap year
### Description of changes
Handle a number of special cases in matching inputdata dates to model dates.
These cases are:

-   Model is no_leap, data is Gregorian and leapyear date 2/29 is encountered in data - skip date
-   Model is Gregorian, data is no_leap and leapyear date 2/29 is encountered in model - repeat 2/28 data
-   Model is Gregorian, data is gregorian but leapyears do not align.
-       if in model leap year repeat data from 2/28 
-       if in data leap year skip date 2/29


### Specific notes

Contributors other than yourself, if any:  @mvertens 

CDEPS Issues Fixed (include github issue #): ESCOMP#190 

Are there dependencies on other component PRs (if so list): ESCOMP/CESM_share#35

Are changes expected to change answers (bfb, different to roundoff, more substantial): bfb

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

Testing performed (e.g. aux_cdeps, CESM prealpha, etc):  Neon spinup of over 100 years

Hashes used for testing:

sM  ./ccs_config
        modified sandbox, ccs_config_cesm0.0.44 (branch main) --> ccs_config_cesm0.0.38
    ./cime
        clean sandbox, on cime6.0.45
s   ./components/cdeps
        clean sandbox, 0f3f707 (branch leap_year_corrections) --> cdeps0.12.63
    ./components/cdeps/fox
        clean sandbox, on 4.1.2.1
    ./components/cdeps/share/genf90
        clean sandbox, on genf90_200608
    ./components/cism
        clean sandbox, on cismwrap_2_1_95
    ./components/cism/source_cism
        clean sandbox, on cism_main_2.01.011
 M  ./components/cmeps
        modified sandbox, on cmeps0.13.71
    ./components/cpl7
        clean sandbox, on cpl7.0.14
    ./components/mizuRoute
        clean sandbox, on 34723c2e4df7caa16812770f8d53ebc83fa22360
    ./components/mosart
        clean sandbox, on mosart1_0_45
    ./components/rtm
        clean sandbox, on rtm1_0_78
e-o ./doc/doc-builder
        -, not checked out --> v1.0.8
    ./libraries/mct
        clean sandbox, on MCT_2.11.0
    ./libraries/parallelio
        clean sandbox, on pio2_5_7
s   ./share
        clean sandbox, bfa2b5d0a9de06153f2ac94a95818568a1f5cf11 (branch shr_cal_leapyear) --> share1.0.12
    ./src/fates
        clean sandbox, on sci.1.58.1_api.24.1.0
handle edge case model no_leap, data gregorian
initialize this field so that debug doesnt fail here
jedwards4b and others added 22 commits January 3, 2023 15:43
code cleanup

Description of changes

Remove all gfortran warnings except unused-dummy-argument with the exception of the external fox code.
Specific notes

Contributors other than yourself, if any:

CDEPS Issues Fixed ESCOMP#204

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

Are changes expected to change answers (bfb, different to roundoff, more substantial): bfb

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

Testing performed (e.g. aux_cdeps, CESM prealpha, etc): cesm prealphas on cheyenne with intel and gnu and updated github testing.

Hashes used for testing: cesm2.3.beta11 + cmeps 2ded3b51bc9b2f545f9e157e56f108dff67b5bd4
cdeps 7bd2b80
the build in github was not consistant with that outside github
@jkbk2004
Copy link
Collaborator

@binli2337 you can start merging in this pr. ufs-community/ufs-weather-model#1597 test is done. I don't have permission to this repo. Please, go ahead to get approvals from reviewers and merge.

@binli2337
Copy link
Collaborator Author

@junwang-noaa Can you review and merge the PR? Thanks!

@junwang-noaa junwang-noaa merged commit 94acf25 into NOAA-EMC:develop Feb 21, 2023
@binli2337 binli2337 deleted the update_cdeps branch June 12, 2023 10:23
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 recent changes from ESCOMP/CDEPS
7 participants