Skip to content

Commit

Permalink
Use P8 as the base and merge the develop-ufs-ccpp-chem branch into it
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 35cf539
Author: Kate.Zhang <Kate.Zhang@noaa.gov>
Date:   Sat Feb 18 06:07:53 2023 +0000

    ccpp-physics point to p8-ufs-ccpp-chem

commit b98cd21
Author: Kate.Zhang <Kate.Zhang@noaa.gov>
Date:   Sat Feb 18 04:47:21 2023 +0000

    Fixed the bugs when merged develop-ufs-ccpp-chem with P8
    Update the aerosol index using consistent names as NASA GOCART and move the smoke folder as P8

commit 0023df6
Merge: 3ffe5ac cbb7239
Author: Kate.Zhang <Kate.Zhang@noaa.gov>
Date:   Fri Feb 17 03:33:57 2023 +0000

    Merge remote-tracking branch 'P8/P8-UFS' into develop-ufs-ccpp-chem

commit 3ffe5ac
Author: Kate.Zhang <Kate.Zhang@noaa.gov>
Date:   Thu Feb 16 00:00:28 2023 +0000

    Merge with P8

commit 26b583e
Author: Kate.Zhang <Kate.Zhang@noaa.gov>
Date:   Tue Jan 17 23:05:51 2023 +0000

    Large scale precipitation is connected from physics to chemical model correctly to get the large scale wet depostion working.

commit 43e0de4
Author: Kate.Zhang <Kate.Zhang@noaa.gov>
Date:   Fri Jan 13 04:05:31 2023 +0000

    Fix some bugs in the CCPP-Chem infrastructure when coupled with P8 FV3GFS

commit af76149
Author: Haiqin.Li <Haiqin.Li@noaa.gov>
Date:   Wed Nov 9 21:39:28 2022 +0000

    "update FV3 I/O for ccpp-chem"

commit 1b5df9c
Author: Haiqin.Li <Haiqin.Li@noaa.gov>
Date:   Sun Nov 6 16:52:28 2022 +0000

    "update for CCPP-Chem p8 physics"

commit e0351a6
Author: Haiqin.Li <Haiqin.Li@noaa.gov>
Date:   Thu Aug 11 17:47:45 2022 +0000

    "ccpp process library"

commit 492d162
Author: Haiqin.Li <Haiqin.Li@noaa.gov>
Date:   Thu Aug 11 17:44:35 2022 +0000

    "add gocart process library"

commit 93dfb52
Author: Shan.Sun <shan.sun@noaa.gov>
Date:   Tue Jun 28 16:11:44 2022 +0000

    -- Adding SDF used in HFIP2022 created by Judy: p8+gf & p8+mynn, based on suite_FV3_GFS_v17_p8;
    -- Also adding a SDF p8+gf+mynn used only in a combined regression test for all codes applied to HFIP.

commit cb06781
Merge: de06413 5000364
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Tue Jun 14 17:43:21 2022 +0000

    Merge branch 'bugfix/gf-dom-fix-to-gsl' into gsl/develop

commit 5000364
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Tue Jun 14 17:36:12 2022 +0000

    point to gsl/develop

commit 4c2f631
Author: samuel.trahan <Samuel.Trahan@noaa.gov>
Date:   Mon Jun 13 17:02:15 2022 +0000

    Merge dom's rap GF b4b fix

commit de06413
Author: Joseph Olson <joeolson42@users.noreply.github.com>
Date:   Fri Jun 10 10:16:38 2022 -0600

    emergency fix to mynn theta calculation

commit 0fc9f34
Author: joeolson42 <Joseph.B.Olson@noaa.gov>
Date:   Thu Jun 9 19:17:29 2022 +0000

    update submodule pointer for ccpp-physics

commit 8bf5085
Author: Samuel Trahan (NOAA contractor) <39415369+SamuelTrahanNOAA@users.noreply.github.com>
Date:   Mon May 23 17:21:32 2022 -0400

    followup to gsl/develop PR (NOAA-GSL#145)

    * Fix from Joe to remove code that was added back in by the big merge.

    * Change suite_FV3_GFS_v15_thompson_mynn to not use mynn surface layer scheme (from Tanya Smirnova)

    * move physics/smoke to physics/physics/smoke

    * Switch to rad_sw_pre in ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml which replaced rrtmg_sw_pre.F90 a while ago

    * point to gsl/develop for ccpp/physics

commit e671787
Author: Samuel Trahan (NOAA contractor) <39415369+SamuelTrahanNOAA@users.noreply.github.com>
Date:   Wed May 18 20:01:11 2022 -0400

    Merge May 16 EMC develop to gsl/develop (NOAA-GSL#144)
.......
.......
.......
.......
  • Loading branch information
zhanglikate committed Feb 22, 2023
1 parent cbb7239 commit 02cba2c
Show file tree
Hide file tree
Showing 14 changed files with 1,931 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[submodule "atmos_cubed_sphere"]
path = atmos_cubed_sphere
url = https://github.com/zhanglikate/GFDL_atmos_cubed_sphere
branch = dev/emc
branch = p8-ufs-ccpp-chem
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/zhanglikate/ccpp-physics
branch = main
branch = p8-ufs-ccpp-chem
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
14 changes: 13 additions & 1 deletion ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,19 @@
'physics/physics/GFS_cloud_diagnostics.F90',
'physics/physics/GFS_rrtmgp_cloud_mp.F90',
'physics/physics/GFS_rrtmgp_cloud_overlap.F90',
'physics/physics/GFS_rrtmgp_sw_post.F90'
'physics/physics/GFS_rrtmgp_sw_post.F90',
# Chemistry
'physics/gsdchem/gsd_chem_seas_wrapper.F90',
'physics/gsdchem/gsd_chem_dust_wrapper.F90',
'physics/gsdchem/gsd_chem_anthropogenic_wrapper.F90',
'physics/gsdchem/gsd_chem_plume_wrapper.F90',
'physics/gsdchem/gsd_chem_dmsemis_wrapper.F90',
'physics/gsdchem/gsd_chem_gocart_wrapper.F90',
'physics/gsdchem/gsd_chem_rad_wrapper.F90',
'physics/gsdchem/gsd_chem_drydep_wrapper.F90',
'physics/gsdchem/gsd_chem_lsdep_wrapper.F90',
'physics/gsdchem/gsd_chem_settling_wrapper.F90',
'physics/gsdchem/gsd_chem_diag_wrapper.F90'
]

# Default build dir, relative to current working directory,
Expand Down
4 changes: 2 additions & 2 deletions ccpp/data/CCPP_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
Interstitial%ntrwx = 0

! perform aerosol convective transport and PBL diffusion
Interstitial%trans_aero = Model%cplchm .and. Model%trans_trac
Interstitial%trans_aero = (Model%cplchm .or. Model%cplchp) .and. Model%trans_trac

if (Model%imp_physics == Model%imp_physics_thompson) then
if (Model%ltaerosol) then
Expand Down Expand Up @@ -1112,7 +1112,7 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
endif
endif

if (Model%cplchm) then
if (Model%cplchm .or. Model%cplchp) then
! Only the following microphysics schemes are supported with coupled chemistry
if (Model%imp_physics == Model%imp_physics_zhao_carr) then
Interstitial%nvdiff = 3
Expand Down
469 changes: 460 additions & 9 deletions ccpp/data/GFS_typedefs.F90

Large diffs are not rendered by default.

Loading

0 comments on commit 02cba2c

Please sign in to comment.