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 dtc develop from ncar master 2020/06/06 #12

Merged
merged 7 commits into from
Jun 8, 2020
Merged

Update dtc develop from ncar master 2020/06/06 #12

merged 7 commits into from
Jun 8, 2020

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Jun 7, 2020 •
edited
Loading

Changes in this PR:

  • butterfly effect
  • minor bugfixes

Associated PRs:

NCAR/ccpp-framework#301
NCAR/ccpp-physics#458
#12
NCAR/fv3atm#52
NCAR/ufs-weather-model#50

For regression testing information, see NCAR/ufs-weather-model#50.

climbfuji and others added 7 commits April 14, 2020 07:30
@climbfuji
Merge NCAR:dtc/develop into NOAA-EMC:dev/emc
34b4503 
- bugfix for GNU compiler
- reduce noise in stdout

Squashed commit of the following:

commit 86c127f
Merge: ce66d6a f9bbb4f
Author: Dom Heinzeller <[email protected]>
Date:   Fri Apr 10 11:32:21 2020 -0600

    Merge pull request NCAR#11 from climbfuji/update_dtc_develop_from_dev_emc_20200409

    Update dtc/develop from dev/emc 2020/04/09

commit f9bbb4f
Author: Dom Heinzeller <[email protected]>
Date:   Thu Apr 9 20:14:24 2020 -0600

    Bugfix for GNU compiler in model/fv_regional_bc.F90, reduce verbosity in driver/fvGFS/atmosphere.F90

commit ecca997
Merge: ce66d6a 80ce8ce
Author: Dom Heinzeller <[email protected]>
Date:   Thu Apr 9 09:38:48 2020 -0600

    Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD

commit ce66d6a
Merge: 4279bf7 9bacf55
Author: Dom Heinzeller <[email protected]>
Date:   Fri Mar 13 13:00:41 2020 -0600

    Merge pull request NCAR#10 from climbfuji/update_from_dev_emc_20200312_and_other_changes

    Update from dev/emc 2020/03/12

commit 9bacf55
Merge: 4279bf7 371a29a
Author: Dom Heinzeller <[email protected]>
Date:   Thu Mar 12 10:33:44 2020 -0600

    Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD

commit 4279bf7
Merge: 846f5a5 4858d33
Author: Dom Heinzeller <[email protected]>
Date:   Mon Mar 9 12:41:51 2020 -0600

    Merge pull request NCAR#9 from climbfuji/update_dtc_develop_from_emc

    Update dtc/develop from dev/emc 2020/03/04

commit 4858d33
Merge: 846f5a5 db3acfb
Author: Dom Heinzeller <[email protected]>
Date:   Fri Feb 28 08:46:55 2020 -0700

    Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD

commit 846f5a5
Merge: 3a4dfd8 9a290ee
Author: Dom Heinzeller <[email protected]>
Date:   Mon Feb 3 07:43:08 2020 -0700

    Merge pull request NCAR#7 from climbfuji/update_dtc_develop_from_dev-emc

    dtc/develop: update from dev/emc 2020/01/27

commit 9a290ee
Merge: 3a4dfd8 a56907a
Author: Dom Heinzeller <[email protected]>
Date:   Mon Jan 27 09:28:57 2020 -0700

    Merge branch 'dev/emc' of https://github.com/noaa-emc/GFDL_atmos_cubed_sphere into HEAD

commit 3a4dfd8
Merge: 0c9ab9e 68576a6
Author: Dom Heinzeller <[email protected]>
Date:   Tue Dec 3 15:19:24 2019 -0700

    Merge pull request NCAR#6 from climbfuji/dtc_develop_udpate_from_emc_20191127

    dtc/develop: update from EMC 2019/11/27

commit 68576a6
Merge: 0c9ab9e 452333a
Author: Dom Heinzeller <[email protected]>
Date:   Wed Nov 27 14:13:08 2019 -0700

    Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD

commit 0c9ab9e
Merge: 9871607 b280b37
Author: Dom Heinzeller <[email protected]>
Date:   Fri Nov 22 16:17:57 2019 -0700

    Merge pull request NCAR#5 from mzhangw/HAFS_fer_hires

    minimal changes to make nwat =4 compatible with Ferrier-Aligo MP scheme

commit b280b37
Author: Man.Zhang <[email protected]>
Date:   Tue Nov 19 14:53:57 2019 -0700

    bug fix

commit 98c58ad
Author: Man.Zhang <[email protected]>
Date:   Tue Nov 19 14:35:10 2019 -0700

    bug fix

commit 8805acd
Author: Man.Zhang <[email protected]>
Date:   Tue Nov 19 14:16:22 2019 -0700

    From Chunxi: The file fv_mapz.F90 also needs to be modified (K_warm)

commit f8a257a
Author: Man.Zhang <[email protected]>
Date:   Thu Nov 14 19:12:39 2019 -0700

    use upper-case CCPP

commit 77f4fba
Author: Man.Zhang <[email protected]>
Date:   Thu Nov 14 13:40:59 2019 -0700

     implement FA scheme water loading option if nwat =4

commit 9871607
Merge: ed75004 786447c
Author: Dom Heinzeller <[email protected]>
Date:   Tue Nov 5 06:59:34 2019 +0900

    Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD

commit ed75004
Merge: 1d6035a f627bfb
Author: Dom Heinzeller <[email protected]>
Date:   Sat Oct 12 08:45:14 2019 +0900

    Merge pull request NCAR#4 from climbfuji/update_gmtb_develop_with_vlab_master_20191006

    Update NCAR gmtb/develop with NOAA-EMC dev/emc 2019/10/06

commit f627bfb
Author: Dom Heinzeller <[email protected]>
Date:   Mon Oct 7 12:12:24 2019 +0900

    Add missing change in fv_cmp.F90 - now identical with EMC code

commit e868186
Author: Dusan Jovic <[email protected]>
Date:   Tue Sep 24 01:57:11 2019 +0000

    change delz from positive value to the original value in the model

commit 672eb0e
Author: fanglin.yang <[email protected]>
Date:   Thu Sep 5 19:24:09 2019 +0000

        VLab Issue #68141

        modified:   docs/FV3_citations.bib
        modified:   model/fv_cmp.F90

        1) Add an option (namelist parameter: intqs) to use temperature instead of the liquid frozen
        temperature to calculate saturation mixing ratio in deriving GFDLMP PDF cloud cover.
        2) Add a literature reference.

commit 1d6035a
Merge: 94ab0e1 fec8205
Author: Dom Heinzeller <[email protected]>
Date:   Mon Sep 23 09:32:55 2019 -0600

    Merge pull request NCAR#2 from climbfuji/remove_transition_mode

    Remove TRANSITION mode

commit fec8205
Author: climbfuji <[email protected]>
Date:   Fri Sep 20 08:52:01 2019 -0600

    Remove TRANSITION mode

commit 94ab0e1
Author: Jun.Wang <[email protected]>
Date:   Mon Aug 26 21:03:55 2019 +0000

    add option to output omega

commit b700cae
Author: climbfuji <[email protected]>
Date:   Fri Aug 30 11:58:00 2019 -0600

    model/fv_dynamics.F90: replicating previous change to gmtb/develop branch of FV3, always allocate dtdt_m for IPD version

commit 3df1171
Author: Laurie Carson <[email protected]>
Date:   Fri Aug 16 10:46:56 2019 -0600

    Add codeowners for NCAR fork
@climbfuji
Delete print statement in driver/fvGFS/atmosphere.F90
ed226dd
@junwang-noaa
Merge pull request NCAR#17 from climbfuji/update_dev_emc_from_dtc_dev…
38d1f33 
…elop_20200414

Merge NCAR:dtc/develop into NOAA-EMC:dev/emc 2020/04/14
@climbfuji
Remove CCPP dynamic build from framework (NOAA-GFDL#18)
f9d4483
@climbfuji
Remove namphysics include flags and add new arguments required for CC…
15c615f 
…PP_interstitial%create routine (NOAA-GFDL#20)
@climbfuji @DusanJovic-NOAA
Butterfly effect (from @DusanJovic-NOAA) (NOAA-GFDL#21)
66c8df2 
* Add butterfly effect option.
* Move butterfly effect option from external_ic.F90 to fv_restart.F90
* model/fv_arrays.F90: provide clarification of butterfly effect in comment

Co-authored-by: Dusan Jovic <[email protected]>
@climbfuji
Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cube…
c74b928 
…d_sphere into HEAD
This was referenced Jun 7, 2020
Merged
Merged
Merged
@climbfuji climbfuji marked this pull request as ready for review June 7, 2020 21:49
@climbfuji climbfuji mentioned this pull request Jun 7, 2020
Merged
@climbfuji
Copy link
Collaborator Author

This PR contains changes coming from the authoritative repositories, which have been approved earlier by the codeowners. The code is identical to the authoritative repositories, except for few differences described in NCAR/ufs-weather-model#50, and all tests passed. I am therefore merging this PR without additional approval.

@climbfuji climbfuji merged commit b3bd04f into NCAR:dtc/develop Jun 8, 2020
climbfuji pushed a commit to climbfuji/GFDL_atmos_cubed_sphere that referenced this pull request Apr 24, 2024
@tclune
Merge pull request NOAA-GFDL#23 from GEOS-ESM/feature/pchakrab/NCAR#12-…
4e7d06f 
…create-tp-core-driver

Feature/pchakrab/NCAR#12 create tp core driver
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grantfirl grantfirl Awaiting requested review from grantfirl

@llpcarson llpcarson Awaiting requested review from llpcarson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@climbfuji @junwang-noaa