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.

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

Update rte-rrtmgp submodule + SCM-only bugfix #924

Merged
merged 4 commits into from
May 25, 2022
Merged

Update rte-rrtmgp submodule + SCM-only bugfix #924

merged 4 commits into from
May 25, 2022

Conversation

dustinswales
Copy link
Collaborator

@dustinswales dustinswales commented May 16, 2022 •
edited by grantfirl
Loading

A small update was made to the dtc/ccpp branch of the rte-rrtmgp submodule to remove excessive warnings in the ccpp-framework. (There were a few types in the rte-rrtmgp code base that did not meet standards when ending their declaration)
This is needed for the CCPP version 6 release.
@mkavulich @ligiabernardet

Another small change needed for the CCPP v6 release is a minor bugfix in scm_sfc_flux_spec.F90 for use with DEPHY-formatted cases using specified surface fluxes. The bugfix just makes sure that all necessary skin temperature variables are given values when using specified surface fluxes.

climbfuji
climbfuji approved these changes May 16, 2022
View reviewed changes
Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

Thanks, @dustinswales!

Qingfu-Liu
Qingfu-Liu approved these changes May 16, 2022
View reviewed changes
Copy link
Collaborator

@Qingfu-Liu Qingfu-Liu left a comment

Choose a reason for hiding this comment

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

Thanks for the code changes

@ligiabernardet ligiabernardet added the CCPP v6 Needed for CCPP v6 public release label May 18, 2022
mkavulich
mkavulich approved these changes May 19, 2022
View reviewed changes
Copy link
Collaborator

@mkavulich mkavulich left a comment

Choose a reason for hiding this comment

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

Thanks for getting this in!

@grantfirl grantfirl changed the title Update rte-rrtmgp submodule Update rte-rrtmgp submodule + SCM-only bugfix May 20, 2022
@grantfirl
Copy link
Collaborator

fixes #927

This was referenced May 23, 2022
Merged
Merged
@grantfirl grantfirl merged commit 6e58242 into NCAR:main May 25, 2022
@grantfirl grantfirl mentioned this pull request Jun 2, 2022
Merged
@dustinswales dustinswales deleted the update_rte_for_CCPP_v6 branch June 9, 2022 15:51
guoqing-noaa added a commit to guoqing-noaa/ccpp-physics that referenced this pull request Feb 22, 2023
@guoqing-noaa
Squash commit the following based on Joe's 2022/06/09 commit(#42184e7…
7b4c766 
…d)+cherry-pick (5544dab - 42184e7)

commit 77bcfb1
Merge: f13ed4e 2d2f1a6
Author: Grant Firl <grant.firl@noaa.gov>
Date:   Fri Jun 3 09:35:42 2022 -0400

    Merge pull request NCAR#903 from lisa-bengtsson/prog_closure

    Add prognostic cumulus closure description in saSAS

commit 2d2f1a6
Merge: 48f4274 f13ed4e
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Fri May 27 13:53:46 2022 +0000

    Merge branch 'main' of https://github.com/NCAR/ccpp-physics into prog_closure

commit f13ed4e
Merge: 6e58242 942f9ad
Author: Grant Firl <grant.firl@noaa.gov>
Date:   Thu May 26 16:34:40 2022 -0400

    Merge pull request NCAR#918 from SamuelTrahanNOAA/ccpp-neptune

    NRL Neptune model 32-bit physics support

commit 48f4274
Merge: fc79cc3 6e58242
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Thu May 26 15:05:43 2022 +0000

    Merge branch 'main' of https://github.com/NCAR/ccpp-physics into prog_closure

commit 942f9ad
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Wed May 25 22:08:44 2022 +0000

    correct bug in machine.F

commit 641544c
Merge: d4d0b71 6e58242
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Wed May 25 18:40:09 2022 +0000

    Merge remote-tracking branch 'community/main' into ccpp-neptune

commit 6e58242
Merge: 01e3d6b 8dae03a
Author: Grant Firl <grant.firl@noaa.gov>
Date:   Wed May 25 13:54:59 2022 -0400

    Merge pull request NCAR#924 from dustinswales/update_rte_for_CCPP_v6

    Update rte-rrtmgp submodule + SCM-only bugfix

commit d4d0b71
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Tue May 24 18:18:45 2022 +0000

    Simplify machine.F and remove unused types.

commit 828f168
Merge: 63020ec 01e3d6b
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Mon May 23 18:50:11 2022 +0000

    Merge NCAR main

commit 8dae03a
Merge: b994063 87359d2
Author: dustinswales <dswales@ucar.edu>
Date:   Fri May 20 09:46:35 2022 -0600

    Merge pull request NOAA-GSL#18 from grantfirl/fix_SCM_specified_surface_flux_bug

    Fix scm specified surface flux bug

commit 87359d2
Merge: 49c7096 01e3d6b
Author: Grant Firl <grant.firl@noaa.gov>
Date:   Fri May 20 09:13:55 2022 -0400

    Merge branch 'main' into fix_SCM_specified_surface_flux_bug

commit fc79cc3
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Thu May 19 19:59:43 2022 +0000

    Change intent to inout for conditional variables

commit 96d0d36
Merge: 6f38cc6 01e3d6b
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Thu May 19 00:14:56 2022 +0000

    Merge branch 'main' of https://github.com/NCAR/ccpp-physics into prog_closure

commit 6f38cc6
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Wed May 18 23:58:09 2022 +0000

    address some review comments, fix decomposition error, correct bug in initialization

commit b994063
Author: Dustin Swales <dustin.swales@noaa.gov>
Date:   Mon May 16 09:16:30 2022 -0600

    Update rte-rrtmgp submodule

commit 49c7096
Author: Grant Firl <grant.firl@noaa.gov>
Date:   Tue May 10 13:49:55 2022 -0400

    make sure that tsfc_wat is calculated when wet = T

commit 63020ec
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Thu May 5 22:46:10 2022 +0000

    Switch to another version of the code that works with 64 bit

commit 3dec4e6
Merge: be534e7 3405ff1
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Thu May 5 04:20:02 2022 +0000

    Merge branch 'main' of https://github.com/NCAR/ccpp-physics into prog_closure

commit be534e7
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Thu May 5 04:08:06 2022 +0000

    addressing some review comments

commit e7c42c7
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Thu May 5 00:43:21 2022 +0000

    Move some code to modules

commit de90593
Merge: 6871a93 3405ff1
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Wed May 4 22:12:14 2022 +0000

    Merge remote-tracking branch 'community/main' into sing_prec_from_main

commit 6871a93
Author: Samuel Trahan <Samuel.Trahan@noaa.gov>
Date:   Wed May 4 17:32:24 2022 +0000

    Changes needed for 32-bit physics

commit 527e1b9
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Mon May 2 22:11:42 2022 +0000

    Pass -DCCPP_SINGLE_PRECISION from cmake to -DSINGLE_PREC in cpp

commit aff574b
Merge: 239710b 7e35351
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Mon May 2 16:02:18 2022 +0000

    Merge remote-tracking branch 'community/main' into sing_prec_from_main

commit 8b815e0
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Fri Apr 29 03:03:46 2022 +0000

    address some bugs caught by debug flag

commit e2d5a2a
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Wed Apr 27 22:40:40 2022 +0000

    cleaning out some print statements

commit 0200e2d
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Wed Apr 27 18:48:38 2022 +0000

    addressing some review comments

commit e969672
Merge: a9b439f 7e35351
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Fri Apr 22 21:10:40 2022 +0000

    merge with upstream

commit a9b439f
Merge: fc7e7a0 860245c
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Fri Apr 22 04:07:35 2022 +0000

    Merge branch 'main' of https://github.com/NCAR/ccpp-physics into prog_closure

commit fc7e7a0
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Fri Apr 22 04:00:31 2022 +0000

    addressing some review comments

commit 89eaad9
Merge: b530db1 e2806f0
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Thu Apr 21 15:05:15 2022 +0000

    Merge branch 'main' of https://github.com/NCAR/ccpp-physics into prog_closure

commit b530db1
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Wed Apr 20 01:29:13 2022 +0000

    cleaning some diagnostics

commit 4f84ed7
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Tue Apr 19 19:22:53 2022 +0000

    add shallow convection closure updates, add ntsigma in generic files

commit 842eae3
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Mon Apr 18 15:05:40 2022 +0000

    Ensuring the moisture budget is correct via PBL, microphysics coupling

commit 235ec38
Author: Lisa Bengtsson <Lisa.Bengtsson@noaa.gov>
Date:   Wed Apr 13 17:44:27 2022 +0000

    add progsigma_calc

commit 239710b
Merge: b17a7e7 8500cea
Author: Grant Firl <grant.firl@noaa.gov>
Date:   Thu Jan 13 11:06:52 2022 -0700

    Merge branch 'main' into sing_prec_from_main

commit b17a7e7
Merge: 805c62c 623feaa
Author: Grant Firl <grant.firl@noaa.gov>
Date:   Tue Dec 7 11:00:17 2021 -0700

    Merge branch 'main' into sing_prec_from_main

commit 805c62c
Author: Grant Firl <grant.firl@noaa.gov>
Date:   Tue Dec 7 10:39:05 2021 -0700

    add single precision code changes from michalakes fork, jm-nrl-32bitfp-24cc09e branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChunxiZhang-NOAA ChunxiZhang-NOAA ChunxiZhang-NOAA approved these changes

@Qingfu-Liu Qingfu-Liu Qingfu-Liu approved these changes

@mkavulich mkavulich mkavulich approved these changes

@climbfuji climbfuji climbfuji approved these changes

@SamuelTrahanNOAA SamuelTrahanNOAA Awaiting requested review from SamuelTrahanNOAA

@grantfirl grantfirl Awaiting requested review from grantfirl grantfirl is a code owner

@mzhangw mzhangw Awaiting requested review from mzhangw mzhangw is a code owner

@panll panll Awaiting requested review from panll

Assignees
No one assigned
Labels
CCPP v6 Needed for CCPP v6 public release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@dustinswales @grantfirl @climbfuji @mkavulich @Qingfu-Liu @ChunxiZhang-NOAA @ligiabernardet