Skip to content

Commit

Permalink
Merge FV3 gsd/develop into fv3atm dtc/develop, squashed commit of the…
Browse files Browse the repository at this point in the history 
… following:

commit 7eed7477b120e9298312f6ea64739052351f288e
Merge: a3043d1 1876fb5
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Nov 21 15:40:23 2019 -0700

    Merge pull request #220 from tanyasmirnova/ruc_land_ice_v1

    Added the capability to initialize Leaf Area Index (LAI) from the cli…

commit 1876fb523f54092c729f61d72ab296f85482a3c4
Author: tanyasmirnova <tanya.smirnova@noaa.gov>
Date:   Wed Nov 20 23:47:09 2019 +0000

    Remove a factor of 100 from LAI output.

commit cbea4199943dc124bdd4f7ac7b04fe2e136c55b7
Author: tanyasmirnova <tanya.smirnova@noaa.gov>
Date:   Wed Nov 20 23:38:14 2019 +0000

    This commits adds LAI to the history output.

commit f7a4ee4d3bc7a011c22118d32fabaa7035b4df1d
Author: tanyasmirnova <tanya.smirnova@noaa.gov>
Date:   Wed Nov 20 20:23:40 2019 +0000

    Added the capability to initialize Leaf Area Index (LAI) from the climatological information.
    This capability is controlled by the new namelist parameter - rdlai, which is added to the
    GFS_typedefs.meta. When rdlai=.false., no changes to the input, but if rdlai=.true., then a
    new variable should be available in sfc_data.nc input, and it will be read in into the xlaixy variable.

commit a3043d1bc1391cedd816f851785de57bf4dcc1b2
Merge: 179cbe7 57d937b
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Sep 24 12:56:30 2019 -0600

    Merge pull request #210 from climbfuji/update_gsd_develop_from_gmtb_develop_20190924

    Update gsd/develop from gmtb/develop 2019/09/24

commit 57d937b8669b5404313f3b2b1c270fdcf532cd1a
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Sep 24 12:36:46 2019 -0600

    Update CODEOWNERS and submodule atmos_cubed_sphere for gsd/develop

commit d7699bab4b20211db4a8ca3988e3ee8a744ab46f
Merge: 86ad37a fadbbda
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon Sep 23 10:13:22 2019 -0600

    Merge pull request #209 from climbfuji/update_submodule_pointer_atmos_cubed_sphere_20190923

    Update submodule pointer for atmos_cubed_sphere 2019/09/23

commit fadbbda009dfccf66cecf814bf1c5475329e1a71
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Sep 23 10:11:18 2019 -0600

    Update submodule pointer for atmos_cubed_sphere

commit 86ad37a15dbd7e99f732c80cb758fad541535326
Merge: d02e260 ef0469f
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon Sep 23 09:33:13 2019 -0600

    Merge pull request #207 from climbfuji/gmtb_develop_update_from_master_20190920

    gmtb/develop update from master 2019/09/20, remove TRANSITION mode

commit ef0469fcb5345d472324720e3c0043b65507c0bd
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 20 08:53:31 2019 -0600

    Remove TRANSITION mode

commit 65bfa600345eed605ac580fd35c984c1d915d405
Merge: 545a5ab b67d9a3
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 20 07:23:01 2019 -0600

    Merge branch 'master' of gerrit:FV3 into gmtb_develop_update_from_master_20190920

commit 545a5ab4fb70f5c7e9164107fb6f77d5ea94128e
Merge: d02e260 42915ea
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 20 06:59:23 2019 -0600

    Merge branch 'master' of https://github.com/NCAR/FV3 into HEAD

commit d02e260c161addf0bc6589b8f91a6098c4cd57ab
Merge: 9ad9373 fd8f98a
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Sep 19 14:40:14 2019 -0600

    Merge pull request #206 from climbfuji/myj_with_dom_mods

    gmtb/develop: MYJ PBL/SFC, Noah MP

commit fd8f98a43258d9f593fff11f14c4216fca484cfd
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Sep 16 15:30:40 2019 -0600

    gfsphysics/GFS_layer/GFS_driver.F90, gfsphysics/makefile, io/FV3GFS_io.F90: re-enable calculation of snocvr in FV3-IPD to avoid b4b issues when 32BIT=Y

commit daab7457cf08c205c5016c8ec7865fbb08b8495f
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 13 16:29:43 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.{F90,meta}: introduce lower bound variable for snow-related arrays in NoahMP, use in metadata table

commit 243977dd91ea022a76dd799f5810357117af13ad
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 13 16:28:01 2019 -0600

    gfsphysics/GFS_layer/GFS_driver.F90: update comment on CCPP code

commit 03b00f445c72e1617bef13971cf2b5dd2c4e412f
Merge: 1bb9ab5 c83f1f7
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 13 15:28:19 2019 -0600

    Merge branch 'noahmp' of https://github.com/grantfirl/FV3 into myj_with_dom_mods

commit 1bb9ab5097d9906db571d4b4f40211646e23b3a2
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 13 15:28:16 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: remove empty line

commit 1627b2359bc490d4cce58a47ffccbc1c27a61ad9
Merge: 7da9ed8 9ad9373
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 13 15:00:37 2019 -0600

    Merge branch 'gmtb/develop' of https://github.com/NCAR/FV3 into myj_with_dom_mods

commit 9ad93730b81314d1ffaf0b98cd81e7d442ccf874
Merge: 1fa34bc 4354488
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Sep 13 15:00:08 2019 -0600

    Merge pull request #204 from climbfuji/correct_longnames_20190909

    gmtb/develop: correct long names, align with SCM

commit 7da9ed859921d2ffe1ffdcf6f17ae2ae58449050
Merge: 4354488 bcfed5b
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Sep 13 10:49:16 2019 -0600

    Merge branch 'myj_from_qingfu' into correct_longnames_20190909

commit 43544887d2b6624606dc82f30e4854dc49f23d20
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Sep 12 21:11:20 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.meta: correct longnames and align with SCM

commit c83f1f738b60772b2ae4dff6f6e2434ccc42bc04
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Sep 10 17:37:42 2019 -0600

    update comments in GFS_physics_driver.F90 for locations of NoahMP-related code

commit b4a674d9ae4144f25261943bf8a4481d09debe96
Merge: 36ab5be 1fa34bc
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Sep 10 17:26:13 2019 -0600

    Merge branch 'gmtb/develop' into noahmp

commit 1fa34bc41fe59e9efbb12aeab474c83bf7670420
Merge: 028a54e 67db064
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sun Sep 8 20:32:08 2019 -0600

    Merge pull request #203 from climbfuji/gmtb_develop_monster_merge_20190904

    Merge gsd/develop, update from Vlab, separate stochastic physics from IPD and CCPP

commit 36ab5be04ffa4e0aabbe7cdae36c378881513739
Author: Grant Firl <grantf@ucar.edu>
Date:   Fri Sep 6 15:15:24 2019 -0600

    change location of interstitial calculation for NoahMP in comments

commit c1d7a918a84ea7cf64f0b63948be73253584663a
Author: Grant Firl <grantf@ucar.edu>
Date:   Fri Sep 6 12:06:09 2019 -0600

    fix bugs in FV3GFS_io.F90 related to #ifdef CCPP directives and noahmp

commit 6e8b0cedd9d98ed469366603bae0bb95bc68a9b2
Author: Grant Firl <grantf@ucar.edu>
Date:   Wed Sep 4 22:09:28 2019 -0600

    add t2mmp and q2mp to interstitial variables for noahmp

commit 42915ea8e753f8be859f6ebf4f5983b4c78b695f
Merge: b30a69a 1d823f8
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Wed Sep 4 16:41:50 2019 -0600

    Merge pull request #202 from climbfuji/github_master_update_from_vlab_master_20190904

    Update GitHub master from Vlab master 2019/09/04

commit 67db064b8d7b2e4b8692c8d5927a6897d49607d3
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Sep 4 15:39:01 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90, gfsphysics/GFS_layer/GFS_typedefs.meta: add interstitial variables and their initialization, add metadata

commit 635bd9f4f39f219fd6599ab724819db0279bc537
Author: Grant Firl <grantf@ucar.edu>
Date:   Wed Sep 4 13:05:15 2019 -0600

    swap metadata for a couple of NoahMP precip variables

commit 0b385edcb8344f0e2f515c63d91c27f43155d351
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Tue Sep 3 01:37:04 2019 +0000

    FV3: this commits #refs 67151, Add aerosol transport to SAMF deep convection scheme, #refs 67152, Export instantaneous convective specific humidity tendency

commit 599dd26768fb988763d6ad2c887432dbfe540d0b
Author: Grant Firl <grantf@ucar.edu>
Date:   Wed Sep 4 10:52:25 2019 -0600

    remove accidentally reverted change in GFS_physics_driver.F90

commit 1d823f846d64a4c6155565042c36f93a281a6887
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Tue Sep 3 01:37:04 2019 +0000

    FV3: this commits #refs 67151, Add aerosol transport to SAMF deep convection scheme, #refs 67152, Export instantaneous convective specific humidity tendency

commit f3b64a02ce0f6703b2b0ff60265a91f896e2a0c7
Author: Grant Firl <grantf@ucar.edu>
Date:   Wed Sep 4 10:40:11 2019 -0600

    remove conversion factor-based directives in GFS_diagnostics.F90

commit 39667a94d78187149a373029ac5bf008ab434fcc
Merge: 5babb96 028a54e
Author: Grant Firl <grantf@ucar.edu>
Date:   Wed Sep 4 10:31:50 2019 -0600

    Merge branch 'gmtb/develop' into noahmp

commit fedc6695589c70f0415f9c8914d4e91b649fe937
Merge: 3332314 179cbe7
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Sep 4 09:08:10 2019 -0600

    Merge branch 'gsd/develop' of https://github.com/NCAR/FV3 into gmtb_develop_update_from_master_20190830

commit 3332314b09fa3a373e0ab132165a1453f6b23fa3
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Sep 4 08:27:44 2019 -0600

    Bugfixes in gfsphysics/GFS_layer/GFS_driver.F90, gfsphysics/GFS_layer/GFS_typedefs.F90 and gfsphysics/GFS_layer/GFS_typedefs.meta following the merge of the stochastic_physics separation PR

commit 5babb964462e6913e3093462522b2430483905ea
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Sep 3 15:50:59 2019 -0600

    remove directives in FV3GFS_io.F90 limiting NoahMP to non-CCPP build; add noahmp_tables.f90 (data only) to makefile for CCPP build (needed in FV3GFS_io.F90 for noahmp cold starts)

commit ede4f37077c866bffb87261edf38e7a8ee388b67
Merge: a721e0d 45ceeac
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Sep 3 14:26:19 2019 -0600

    Merge branch 'fix_sncovr' into noahmp

commit dbef968c7985c72dc9eabf75f5e65141506dbd38
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Jul 10 08:04:32 2019 -0600

    namphysics/NAM_layer/NAM_typedefs.F90, namphysics/NAM_layer/NAM_driver.F90: add new component blksz(:) to NAM_control (GFS_control) DDT, pass to init routine

commit c79b844b35a101db7ed3971d0be7c6077c085cb7
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 9 14:57:36 2019 -0600

    makefile: build_stochastic physics independently of IPD or CCPP in directory ../stochastic_physics

commit 278a1f1aa0915b1bcccc86779cc7bd65ee42bc3b
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 9 14:56:42 2019 -0600

    atmos_model.F90: call stochastic physics independently of IPD or CCPP

commit 24543a1c4365485d782fa29de647512ef384ec81
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 9 14:41:17 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: remove variables for CCPP that are no longer required, add blksz as component to GFS_control also for IPD (is already for CCPP)

commit 76dccf55128cd961461688f2df3a3bd88d5189e0
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 9 14:38:40 2019 -0600

    (1) remove directory stochastic_physics

    (2) gfsphysics/GFS_layer/GFS_driver.F90: remove calls to stochastic_physics, make Init_parm%blksz an input argument to Model%init for both IPD and CCPP

commit 028a54ec8e0596892f9bc01d63df7a1c4867ec41
Merge: d04664e 62fb7fb
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Sep 3 09:20:05 2019 -0600

    Merge pull request #199 from climbfuji/gmtb_develop_update_from_master_20190830

    gmtb/develop: update from master 2019/08/30

commit b30a69a16b0b9cd91b49fe20ea4cf5773e65f26e
Merge: 127baf5 a47b7fc
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Sep 3 08:21:34 2019 -0600

    Merge pull request #200 from climbfuji/update_submodule_pointer_in_FV3_20190903

    master: update submodule pointer for atmos_cubed_sphere

commit a47b7fc2dfe3612b8d0ee8af6d523e3995cc93d8
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Sep 3 08:19:46 2019 -0600

    Update submodule pointer for atmos_cubed_sphere

commit 127baf51f612a7c7f04ebe160b28657773840bac
Merge: ef8bb54 088e5fa
Author: Laurie Carson <carson@ucar.edu>
Date:   Mon Sep 2 14:12:30 2019 -0600

    Merge pull request #198 from climbfuji/update_from_noaaemc_dev_20190830

    Update GitHub NCAR master from Vlab master

commit 45ceeac46d3f3f6dbdcef9bfd9cd43bdc2b1c92c
Author: Grant Firl <grantf@ucar.edu>
Date:   Fri Aug 30 16:04:41 2019 -0600

    remove calculation of sncovr from FV3GFS_io.F90 and from the makefile (for CCPP build)

commit 62fb7fb3cf5900e6f71c4a7a52f6d6fbc3b629a1
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Tue Aug 27 20:17:31 2019 +0000

    FV3: This commits #refs 66699, Calling radiative transfer parameterizations on each physics time step and #refs 66931,fix time window for accumulated fields in fv3 with IAU

commit 9265ae03ec7af41420210a427149268118d81846
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Aug 30 12:04:36 2019 -0600

    Update .gitmodules and set default branch for atmos_cubed_sphere to gmtb/develop, update submodule pointer

commit 1028b3f905d7f74f173a854d55fdc0a2ca6b7c82
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Sun Aug 25 02:54:03 2019 +0000

    FV3: this commits #59519, separate FV3 dynamical core repository from FV3

commit 088e5fa16afc1b3ffd3932294de83aa72c7971ac
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Tue Aug 27 20:17:31 2019 +0000

    FV3: This commits #refs 66699, Calling radiative transfer parameterizations on each physics time step and #refs 66931,fix time window for accumulated fields in fv3 with IAU

commit cf98bfae384ee3cb2969c69fafa19f79156ed15d
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Aug 30 08:36:09 2019 -0600

    Update .gitmodules to point to NCAR fork of GFDL_atmos_cubed_sphere

commit 31e13942a8e543e365216b134895e6ceffef8a83
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Sun Aug 25 02:54:03 2019 +0000

    FV3: this commits #59519, separate FV3 dynamical core repository from FV3

commit d04664e793f8cff5502a5127ce03f1e19352f676
Merge: 47fa9fb a5d2226
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Aug 30 07:39:08 2019 -0600

    Merge pull request #195 from climbfuji/github_gmtb_develop_address_physics_issue_300_and_coupled_code

    GitHub gmtb develop address physics issue 300 and coupled code

commit ef8bb5470f7d53b4afc6087f7f601f4b8cd8ee80
Merge: 8a86358 bd46b82
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Aug 29 15:33:03 2019 -0600

    Merge pull request #197 from grantfirl/master

    add Julie as codeowner

commit 47fa9fbb67fdfe1d7ace52282fc8974eea9b1a03
Merge: 21fdde6 561eb79
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Aug 29 15:32:36 2019 -0600

    Merge pull request #196 from grantfirl/gmtb/develop

    add Julie as codeowner

commit bd46b82d013091fcf36f75ab04624c55efd96dd3
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 29 15:07:57 2019 -0600

    add Julie as codeowner

commit 561eb79d9133f1b285eb1503bbad5c24d6f460dc
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 29 15:05:15 2019 -0600

    add Julie as codeowner

commit a5d2226d5d37464e9feea05b32db08572468fb16
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Aug 28 17:29:25 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.meta: rename instantaneous_upward_sensible_heat_flux to instantaneous_surface_upward_sensible_heat_flux_for_chemistry_coupling

commit 5fac92183886479afc473bd01b9cd70840bd54fc
Merge: b803db9 7ffc16a
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Aug 28 10:03:12 2019 -0600

    Merge branch 'gmtb/develop' of https://github.com/panll/FV3 into HEAD

commit b803db9182aad295b64e9d62052a4e601dd029fe
Merge: 21fdde6 fd929f1
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Aug 28 10:02:36 2019 -0600

    Merge branch 'fix_LSM_units' of https://github.com/grantfirl/FV3 into HEAD

commit 179cbe760b1d06960fecafb811241f0a6f2293d4
Merge: 0591b5c 7994ef9
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Aug 27 16:38:23 2019 -0600

    Merge pull request #190 from grantfirl/fix_RUC_LSM_precip_partitioning

    Address ccpp-physics issue #301

commit 21fdde6b7db39fa24ff667a42b3f79edeab50e1e
Merge: a26436b 2f5bd1e
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Aug 27 16:29:54 2019 -0600

    Merge pull request #194 from climbfuji/gmtb_develop_fix_RUC_LSM_precip_partitioning

    gmtb/develop: address issue #301 (fix RUC LSM precip partitioning)

commit fd929f175da3b3e3ba16c0984f46f97e6246c1be
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Aug 27 16:27:48 2019 -0600

    fix soil moisture units in non-CCPP sfc_drv.f and sfc_noahmp_drv.f

commit a721e0d3c2913dd1fa174b0fb3741b802e5b4c4f
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Aug 27 15:02:51 2019 -0600

    remove stop for NoahMP LSM through CCPP in GFS_typedefs.F90

commit dcd9771211b2476000e968b02ebedc7e35f0f4a7
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Aug 27 13:43:37 2019 -0600

    wrap removal of conversion factors for 3 variables in GFS_diagnostics.F90 in #ifndef CCPP directives

commit 2f5bd1ef13db0b857b03b2e43f7b5bfb930d8470
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Aug 20 14:13:34 2019 -0600

    fix CCPP metadata for convective/non-convective precip variables used in RUC LSM

commit a26436be1da9816330d375fb111e79204398aaee
Merge: 44d9541 6363392
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Aug 27 07:13:16 2019 -0600

    Merge pull request #186 from bluefinweiwei/cires_ugwp

    UGWP Version 0

commit bcfed5b20a6b18f5e9ad96b16763889a0fb0c4b6
Author: Qingfu Liu <Qingfu.Liu@noaa.gov>
Date:   Tue Aug 27 11:17:39 2019 +0000

    add MYJ surface layer scheme and MYJ PBL scheme to CCPP

commit 2f5183ea7052fa39592f8b0fbec36326174526c9
Author: Grant Firl <grantf@ucar.edu>
Date:   Mon Aug 26 13:32:59 2019 -0600

    move julian and yearlen to GFS_control_type (from interstitial) and add metadata for vars needed in GFS_time_vary_pre_run

commit 636339227e9948feb58e4848a8983c822bbe831a
Merge: 07b2f1f 0b22293
Author: Weiwei <42526954+bluefinweiwei@users.noreply.github.com>
Date:   Fri Aug 23 13:23:21 2019 -0600

    Merge pull request #1 from climbfuji/ugwd_dom

    UGWD update for open PR to gmtb/develop

commit 0b2229387070e966b5bc6892bd9704d7e57a239c
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Aug 23 11:59:01 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.meta: correct variable dimensions

commit 95071efdde50b128749f5719dce45fc1b2e52729
Author: Grant Firl <grantf@ucar.edu>
Date:   Fri Aug 23 11:11:07 2019 -0600

    add density of liquid water to constants available to CCPP schemes

commit f7b7df469022a7d74fd43591aabc57ba7e4ddbcf
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Aug 23 08:52:51 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: update CCPP comments for UGWP code changes

commit 539d331b5f578dd0c22b2131b54662cfff8839dd
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Aug 23 08:52:22 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.{meta,F90}: import con_p0, use instead of locally defined p_ref, add metadata

commit 5717d0f19ea5b61010910fc0bf50b2529650dd21
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 22 13:32:30 2019 -0600

    change comments to reflect locations of NoahMP interstitial code

commit a43041878ed867ec04f3d863559089d2c5d20fef
Merge: 9ffcba3 44d9541
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Aug 22 11:19:43 2019 -0600

    Merge branch 'gmtb/develop' of https://github.com/NCAR/FV3 into ugwd_dom

commit 9ffcba3b817c779dfbd7d7b7fe84d2228b9c652e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Aug 22 11:19:16 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: remove unnecessary comment

commit 44d95416b0921f5947e93f3aa29ef31ab1b73d4a
Merge: e4e7ee6 cef4ace
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Aug 22 11:17:41 2019 -0600

    Merge pull request #191 from climbfuji/bugfix_gfdlmp_ccpp

    gmtb/develop: bugfix for CCPP GFDL-MP when effective radii are not used

commit 697003f6b26443df0f385b17a2202f70d0f4b476
Merge: e4e7ee6 07b2f1f
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Aug 21 14:24:23 2019 -0600

    Merge branch 'cires_ugwp' of https://github.com/bluefinweiwei/FV3 into HEAD

commit 04e913f0b90264dc97b122bb1ab789beedde9547
Author: Grant Firl <grantf@ucar.edu>
Date:   Wed Aug 21 13:30:00 2019 -0600

    initial addition of NoahMP variables to GFS_typedefs.F90

commit 7994ef98ad93bc5999d9a105cba3773ae84da6b5
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Aug 20 14:13:34 2019 -0600

    fix CCPP metadata for convective/non-convective precip variables used in RUC LSM

commit ab4264fdd0128ca39897b324ed71aa8b113ed6ad
Author: Grant Firl <grantf@ucar.edu>
Date:   Tue Aug 20 13:50:54 2019 -0600

    removed conversion factor for soil moisture and runoff diagnostics since they now have the desired units directly in physics code; corrected CCPP units in GFS_typedefs.meta

commit 7ffc16a7ed7f759e414529cd8873417e0dae408d
Author: Linlin.Pan <Linlin.Pan@noaa.gov>
Date:   Mon Aug 19 21:52:12 2019 +0000

    adding couple option in CCPP with modified variable names.
    passed regression tests.

commit 7f7e0a226264cd8928282cabad4822b41f019ddb
Merge: 915dafd e4e7ee6
Author: panll <lpan@ucar.edu>
Date:   Mon Aug 19 09:55:48 2019 -0600

    Merge pull request #1 from NCAR/gmtb/develop

    Gmtb/develop

commit cef4ace8dbb72e551b452743590f1e39739a5c6d
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jul 18 10:58:56 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: bugfix for GFDL-MP in CCPP when effective radii are not used

commit 0591b5c5100d75a79c604d9e91985a8a75aaf60b
Merge: a6ce9d4 c9606fb
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon Aug 19 08:48:29 2019 -0600

    Merge pull request #188 from climbfuji/update_gsd_develop_with_vlab_master_20190816

    Update GitHub gsd/develop with Vlab master 2019/08/16

commit e4e7ee6c640ca64b0ad8915c8ee06631c3c5590c
Merge: 0af7e33 b7b423c
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sat Aug 17 16:25:45 2019 -0600

    Merge pull request #184 from climbfuji/bugfix_allocating_dtdt_m_non_ccpp_version

    Bugfix for allocating dtdt_m in fv_dynamics.F90

commit c9606fba7e19ab86aa60b002f9ccd972b754d219
Author: Dusan Jovic <dusan.jovic@noaa.gov>
Date:   Fri Jul 26 13:45:14 2019 +0000

    Fix an issue introduced in the previous commit where merge conflict markers were inadvertently committed.

commit 02efdda480a2d1b610e3057d95fa4ac6f21d6ca6
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Thu Jul 18 15:21:28 2019 +0000

    FV3: This commits #refs 65267 adding obs-based roughness length formulations and adjustment of K for hurricane simulations

    Change-Id: Ifea0ed42e7611648f4daa2dc24921561b4080691

commit 8a86358617ff8bc39731b6f8a84128cfb3e74075
Merge: 396b10d 319bb44
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Aug 16 11:36:41 2019 -0600

    Merge pull request #187 from climbfuji/update_github_master_from_vlab_master_20190816

    Update GitHub master from Vlab master 2019/08/16

commit 319bb4411a8884493430166b2c4953bd5166e7a2
Author: Dusan Jovic <dusan.jovic@noaa.gov>
Date:   Fri Jul 26 13:45:14 2019 +0000

    Fix an issue introduced in the previous commit where merge conflict markers were inadvertently committed.

commit b757a06cbb507adcf73b85256cf8ed1869b8e425
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Thu Jul 18 15:21:28 2019 +0000

    FV3: This commits #refs 65267 adding obs-based roughness length formulations and adjustment of K for hurricane simulations

    Change-Id: Ifea0ed42e7611648f4daa2dc24921561b4080691

commit 07b2f1f9e7db1155463698956755cd9b899ce0b7
Author: Weiwei <weiweili@ucar.edu>
Date:   Tue Jul 16 14:57:32 2019 -0600

    	modified:   GFS_typedefs.F90
    	modified:   GFS_typedefs.meta

commit 915dafd466c0b7195d1e494d327feb55d4da8981
Author: Linlin.Pan <Linlin.Pan@noaa.gov>
Date:   Thu Aug 15 04:43:15 2019 +0000

    adding new variables for coupling option in CCPP:

    gfsphysics/GFS_layer/GFS_typedefs.F90 -- new variables allocation and initiation included
    gfsphysics/GFS_layer/GFS_typedefs.meta -- new variables definiation  added

commit b7b423cbf65f30f2c2a2d928c6814d746cbf202e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Aug 9 11:47:51 2019 -0600

    atmos_cubed_sphere/model/fv_dynamics.F90: always allocate dtdt_m, because its dimensions are hardcoded in fv_mapz.F90

commit dfb7db58bd44c48853ae6cd55efeaa731e3afa5f
Merge: 0af7e33 a3ea903
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Aug 8 14:05:59 2019 -0600

    Merge branch 'MG_array_allocation' of https://github.com/grantfirl/FV3 into HEAD

commit 0af7e331bdc79d81a9f0daf6f7a4d64e9170a440
Merge: b1d8ec4 5b4c6e5
Author: grantfirl <grantf@ucar.edu>
Date:   Tue Aug 6 13:45:45 2019 -0600

    Merge pull request #180 from grantfirl/add_interstitial_comments

    Document locations of CCPP-implemented code within GFS_physics_driver.F90

commit 5b4c6e5e51738c28fd4616e7cb5ee401817f37b6
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 1 16:35:28 2019 -0600

    fix comment related to stochastics in GFS_driver.F90

commit f8f792b889ab19a6c99384c7b1453144ab263bc6
Merge: 4dc853b b1d8ec4
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 1 14:52:11 2019 -0600

    Merge branch 'gmtb/develop' into add_interstitial_comments

commit b1d8ec4d6eb4d4f7519c608fe5f76fbacd8e7f6c
Merge: c4712c2 5d14eec
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Aug 1 14:46:23 2019 -0600

    Merge pull request #181 from climbfuji/new_metadata_format_step1_20190725

    Migrate to new metadata format step 1

commit 4dc853b8ca35494376b8e811f1f2916f61b648a6
Merge: 31e0cc6 c4712c2
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 1 14:00:56 2019 -0600

    Merge branch 'gmtb/develop' into add_interstitial_comments

commit 31e0cc65bf4eea12e2072c5f3edd9011c99a1bd1
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 1 13:53:25 2019 -0600

    add comments in GFS_driver.F90 and GFS_radiation_driver.F90 to tell users locations of code in the CCPP

commit 5d14eec31116d3b2f4902695c9f12a05f6748d70
Merge: f575b62 417f8ce
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Jul 31 15:47:56 2019 -0600

    Merge branch 'master' of gerrit:FV3 into new_metadata_format_step1_20190725

commit f575b6205aafc91e2d37130febe9a6934e2e352b
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Jul 24 16:44:16 2019 -0400

    gfsphysics/GFS_layer/GFS_typedefs.F90: add metadata for new HAFS variable GFS_Control%sfc_z0_type

commit 3990afc75001f55529d0be960ad7ea149715f669
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Jul 31 14:17:45 2019 -0600

    Convert CCPP type and variable definitions to new metadata format, introduce variables for all dimensions needed, add comments about further work

commit a3ea903db48889bf163b33f7fbc6644fae8f1731
Author: Grant Firl <grantf@ucar.edu>
Date:   Wed Jul 31 12:41:08 2019 -0600

    conditionally allocate arrays for Morrison-Gettelman microphysics scheme

commit 7b4db3ea1751644174dc22c1d8f5e34c3176bf12
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jul 25 16:31:42 2019 -0600

    gfsphysics/CCPP_layer/CCPP_typedefs.F90, gfsphysics/GFS_layer/GFS_typedefs.F90: substitute dashes with underscores in variable standard names

commit 2cdcc3b4d6af372194c52293b537de759d36bed4
Author: Grant Firl <grantf@ucar.edu>
Date:   Sun Jul 21 19:13:19 2019 -0600

    add comments in GFS_physics_driver.F90 to tell users locations of code in the CCPP

commit a6ce9d412e31a865116183c817fd5f0db40c44db
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jul 18 10:45:01 2019 -0600

    Update CODEOWNERS to enable branch protection

commit 9def0cf844a3bc743c842e35a070128b9fc0035d
Merge: a5c8b40 780d3a8
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Wed Jul 17 20:48:05 2019 -0600

    Merge pull request #179 from climbfuji/add_regression_tests_20190717

    gsd/develop: add regression tests for Thompson only, GF only, MYNN only & cleanup

commit 780d3a87df3dd7749d960af0bfac876c553c21a7
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Jul 17 14:13:03 2019 -0600

    Remove namelist option make_number_concentrations, this will be used by default for Thompson MP

commit a5c8b40e37ebb410e721e00f04350086b27da834
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 16 15:00:57 2019 -0600

    Update CODEOWNERS to GSD team

commit 1cfdbb099f5ff7bcc30e0290ea3c8aaf7f0f714b
Merge: 9595fb7 c4712c2
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 16 14:52:54 2019 -0600

    Merge branch 'gmtb/develop' of https://github.com/NCAR/FV3 into HEAD

commit c4712c233cb6cb5d68e1dd050fd3a4889c20f53d
Merge: ae1d3d9 d0359b3
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Jul 16 14:46:17 2019 -0600

    Merge pull request #178 from climbfuji/update_gmtb_develop_from_vlab_master_20190716

    Update gmtb/develop from Vlab master 2019/07/16

commit d0359b3f8f8ec129b3be65a6aafde203bbfb4f1f
Merge: ae1d3d9 64fc1f1
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 16 14:41:30 2019 -0600

    Merge branch 'master' of gerrit:FV3 into HEAD

commit 396b10dcbd91c577a0dfb3094e2cd0d463f1046a
Merge: c4ef4b0 e0fed0f
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Jul 16 14:37:34 2019 -0600

    Merge pull request #177 from climbfuji/update_master_github_from_master_vlab

    Update master GitHub from master Vlab

commit e0fed0fdda5b8d290cae2a5550f1baf9c8977b92
Merge: c4ef4b0 64fc1f1
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 16 14:33:18 2019 -0600

    Merge branch 'master' of gerrit:FV3 into HEAD

commit ae1d3d92ad53af377789e1b353dbdc96e65cb66c
Merge: 5c1fb7d 9207155
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Jul 16 14:23:13 2019 -0600

    Merge pull request #176 from climbfuji/bugfix_gf_conv_AND_thompson_cleanup_20190709

    Bugfix GF convection, Thompson cleanup 2019/07/09

commit 5c1fb7dc24337aecc5abcd08fad0c0c776f43cc6
Merge: 981af01 dfe41ca
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Jul 11 08:37:15 2019 -0600

    Merge pull request #175 from climbfuji/update_from_github_master_20190708

    Update from GitHub (=VLab) master 2019/07/08

commit 9207155591cf01f0825105dcd8f708e32ceeecae
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jul 9 10:31:31 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: adjust number of tracers in PBL tracer array for Thompson MP, add guard to prevent running Thompson MP with cplchm (not configured)

commit dfe41ca3b68c4fdc6c5c30e6ed1a38a39b25f618
Merge: d27d347 c4ef4b0
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Jul 8 11:24:40 2019 -0600

    Merge branch 'master' of https://github.com/NCAR/FV3 into HEAD

commit d27d34737295bb5f3a30581c92aa11fc665edba1
Merge: 981af01 3dc7e9b
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Jul 8 11:24:07 2019 -0600

    Merge branch 'master' of gerrit:FV3 into HEAD

commit c4ef4b0944a1dbbea4a371a5f98cf18f407f181e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Jul 8 08:23:56 2019 -0600

    Add CODEOWNERS after mirroring Vlab master

commit 981af01d87d8b302cafd19cfb07e66443f7a18d4
Merge: 66b1f26 3e3b1b7
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Wed Jul 3 07:58:40 2019 -0600

    Merge pull request #173 from climbfuji/cleanup_work_gerrit_codereview_20190701

    Cleanup work gerrit codereview 2019/07/01

commit 3e3b1b701466a9884217d36a5e729866acfd7f7d
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Jul 1 13:44:35 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: comment out unneccessary/redundant code as per code review

commit 66b1f26a0d5b576c2c7b39d6a009c8fb7d4822c4
Merge: 132bd90 754129f
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sun Jun 30 20:25:43 2019 -0600

    Merge pull request #172 from climbfuji/cleanup_work_gerrit_codereview_20190627

    Cleanup work gerrit code review part 2 - 2019/06/29

commit 754129f5d24c092edc9e7f91031217a3d6bae485
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Jun 29 09:30:17 2019 -0600

    Optimization (CCPP-only): allocate Noah MP restart variables only if Noah MP is actually used

commit 6b54841392e5cc9c9fab6ef3d64ab3af0be8eefb
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Jun 29 06:52:25 2019 -0600

    CCPP_layer/makefile,  gfsphysics/makefile: set CPP directives for promoting dynamics/fast physics to 32-bit

commit 4899b5d9d979dc96b9f6a1978adf81156867ee81
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Jun 28 14:22:23 2019 -0600

    gfsphysics/physics/GFS_debug.F90, gfsphysics/GFS_layer/GFS_physics_driver.F90, gfsphysics/GFS_layer/GFS_diagnostics.F90: bugfixes following the reverse of the Diag%{wet1,sr} -> Sfcprop{wet1,sr} change

commit afb55926beb9255813e011e7c82bbe93c5beefab
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Jun 28 13:48:57 2019 -0600

    atmos_cubed_sphere/tools/external_ic.F90: add CPP guard to logic for reading in Thompson aerosols

commit 50576da069d45a9d6602cb9301db04163f3331da
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Jun 28 13:46:49 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90, gfsphysics/physics/physcons.F90, gfsphysics/physics/sfc_sice.f: revert cimin changes (moved from sfc_sice to physcons) for non-CCPP builds

commit a3f9fefd27f45b6ef64930648532c65c29bcca4c
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Jun 28 13:40:31 2019 -0600

    gfsphysics/physics/radiation_clouds.f: fix bug for radiation-clouds in Thompson/WSM6 cloud scheme

commit d01ebbc1205d39e744b40fd4efb202804974fa78
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Jun 28 13:37:46 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90, io/FV3GFS_io.F90: RUC now uses srflag and not sr, revert change of moving sr from Diag to sfcprop, and remove sr from restart information for RUC

commit ef9936381fbd26276147ca58010e24a71a25728b
Merge: a00ec68 132bd90
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 22:45:25 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into cleanup_work_gerrit_codereview_20190627

commit a00ec683be47562518240938f72783f652973c8e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 22:45:10 2019 -0600

    io/FV3GFS_io.F90: rename wetness variable for RUC LSM from wet1 to wetness

commit f0fa127d278f2a1321560e190f7e80698839238e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 22:43:26 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: use different wetness variables for RUC LSM and other LSMs, update metadata for CCPP

commit 9f21fe1c50dd33e99a8d6d3d94402f0ec01cd192
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 22:41:42 2019 -0600

    gfsphysics/GFS_layer/GFS_diagnostics.F90: use different wetness variables for RUC LSM and other LSMs, cleanup code for subsurface variables, rename RUC LSM soill output to slc to be consistent with Noah MP

commit 132bd90db5f033d479eb0892e840cd5b03fa1bb9
Merge: 7ab6d31 00db91c
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Jun 27 22:32:52 2019 -0600

    Merge pull request #171 from climbfuji/cleanup_work_gerrit_codereview_20190626

    Cleanup work for CCPP transition 2019/06/27 - 1

commit 00db91cd2f37e84a747bab70dedbdc607e54ce3b
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:21:23 2019 -0600

    ipd/IPD_typedefs.F90: cleanup code, remove remaining remnants of old HYBRID build, remove unused IPD_finalize

commit 009d0bf91514ba1fbc69b28014d0b50ff0da0e70
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:20:05 2019 -0600

    ipd/IPD_driver.F90: cleanup code, remove remaining remnants of old HYBRID build, remove unused IPD_finalize

commit 953cb7f8542b094b10b84bf1eecd0a66cd9944be
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:19:12 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: check and remove old comments as needed, remove standard_name for composite dq3dt to prevent its usage, allocate d?3dt arrays for CCPP only if ldiag3d is true

commit 135d62927a63f8487858f94586e81e760f505d5b
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:17:14 2019 -0600

    gfsphysics/GFS_layer/GFS_driver.F90: cleanup code, remove unused GFS_finalize

commit c0abdb637c9c77df9887d5342c5e4394cee3b311
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:16:41 2019 -0600

    gfsphysics/GFS_layer/GFS_abstraction_layer.F90: cleanup code, remove remaining remnants of old HYBRID build, remove unused GFS_finalize

commit 9fd64b4d366997fa751c07d46e3d8f9b2bb81945
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:16:08 2019 -0600

    atmos_model.F90: cleanup code, remove remaining remnants of old HYBRID build

commit 97f665fb5c2436f0f436f51cb77fbabc87e09f31
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:15:10 2019 -0600

    atmos_cubed_sphere/tools/external_ic.F90: remove unnecessary comments

commit 226b417ac8da6af8bffed3b7567f0a409b311d7f
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:14:30 2019 -0600

    atmos_cubed_sphere/model/fv_regional_bc.F90: remove unnecessary comments

commit eb1c50563e3f0d6189c01be15b3e4b4b1f12c680
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Jun 27 11:12:05 2019 -0600

    CCPP_layer/CCPP_driver.F90: Simplify physics_init, run over entire domain instead of multiple blocks

commit 00a02ca2cdff5bc5625739015853102d270726af
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Jun 26 11:56:45 2019 -0600

    makefile: set SIONLIB_LINK_FLAGS only for CCPP build, do not add to non-CCPP ESMF makefile fragment

commit 7ab6d3111322e306251e50ffc88bd1efa8d7e310
Merge: 386ab98 0e12270
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Wed Jun 26 08:43:58 2019 -0600

    Merge pull request #170 from climbfuji/ruclsm_b4b_20190625

    RUC LSM b4b through restarts, cleanup for Thompson MP / effective radii / debug output

commit 0e122708f6f8ef3a92ce3ff4638cb9d6b94e115a
Merge: c9cbbc8 386ab98
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jun 25 21:25:58 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into ruclsm_b4b_20190625

commit c9cbbc8a21b46987e0fa170650d8117882c40509
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jun 25 21:25:22 2019 -0600

    gfsphysics/physics/GFS_debug.F90: comment out Diag%fluxr components, not required for b4b (purely diagnostic and not in output)

commit 6635068b4dc8b8916fa2903b0e2bf721b0917b9a
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Jun 25 21:24:20 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: improve debug print of dry/wet/icy components of CCPP interstitial type

commit 386ab989b837db3a6bbd9c47c2911673c3c8af6e
Merge: 470681c 6ce0582
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Jun 25 08:26:01 2019 -0600

    Merge pull request #169 from NCAR/bugfix_gfs_phy_tracer_config_suffix

    Bugfix gfs phy tracer config suffix .f -> .F

commit 6ce05823d64a49151d38e48a4dc960fd6a6cc3a6
Author: climbfuji <dom.heinzeller@icloud.com>
Date:   Tue Jun 25 08:24:16 2019 -0600

    Bugfix: fix suffix of physics/gfs_phy_tracer_config.f->F

commit 470681c382fd0d62a3cf45ca372bb06f31e16df9
Merge: d60d8e6 abb621f
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Jun 21 08:59:35 2019 +0200

    Merge pull request #168 from climbfuji/ccpp_github_update_vlab_master_20190611

    CCPP GitHub update from VLab master 2019/06/11

commit abb621fe28a61ff26cfc04849217b8cf3030e92d
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Jun 14 09:54:17 2019 -0600

    This commit combines three commits to Vlab master (NEMSfv3gfs and FV3):

    commit ee9977192f6782df21d2af23979ec67683ac020e
    Author: Dusan Jovic <dusan.jovic@noaa.gov>
    Date:   Mon Jun 10 14:20:34 2019 +0000

        NEMSfv3gfs: this commits #refs 56264: support fractional landmask on FV3 grid, and #refs 64400: bug fix for UGW and in CSAW

        Change-Id: Id42e31a8b32ba52dd810e98dff059b14135884ec

    commit a0fca321ffd9fff1e929c00f3e6d467154610065
    Author: Dusan Jovic <dusan.jovic@noaa.gov>
    Date:   Thu Jun 6 13:54:04 2019 +0000

        NEMSfv3gfs: this commits #refs 64015 Add updated scale-aware TKE-based moist EDMF scheme. Updated fv3_cap #refs 62862

        Change-Id: Ic6a04044bd2826a3a4be700e77067ff435fadc56

    commit a2c9fdabf3aa1e99ab8037c319820c9e440fb894
    Author: Jun Wang <jun.wang@noaa.gov>
    Date:   Tue Jun 4 01:26:37 2019 +0000

        NEMSfv3gfs: this commits #refs 61507, coupling Noah MP to fv3gfs

        Change-Id: Ia3b86d247d98ee143e47b5e41fce3ae92dde0564

commit d60d8e638f12bc6ebfb77a042b0f75774f47eb5c
Merge: 7d6c953 d00e8e6
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu May 30 22:00:51 2019 -0600

    Merge pull request #162 from climbfuji/bugfix_fractional_landmask_and_cleanup

    Bugfix fractional landmask, scientific documentation update, cleanup

commit d00e8e6d8c80e9f1f409fa3abb52f5a864efd738
Merge: f42c3ed 7d6c953
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu May 30 08:41:54 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into bugfix_fractional_landmask_and_cleanup

commit 7d6c95383258c9b9813614953876a191bce8b55b
Merge: 9adc6bc e90a8de
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu May 30 06:34:35 2019 -0600

    Merge pull request #161 from climbfuji/gsd_suite_cleanup_and_fractional_landmask_follow_up

    GSD suite cleanup and fractional landmask follow up

commit f42c3ed52f50286fa65117c879dd8f0b7d0b0fc3
Author: shan.sun <shan.sun@noaa.gov>
Date:   Fri May 24 16:10:37 2019 +0000

    1.) Revert back to 1f45136245cde52b39e93ab29f0d36020b0f7e63 :
        This rewinds cleanup in sfc_diag.f and GFS_physics_driver.F90
    2.) Then, fix bug for ice point to be from ">15%" to ">=15%" to be consistent with initial condition, which defines slmsk=2 for >=15%.
        This bugfix is in the following files:
        GFS_physics_driver.F90
        atmos_model.F90

commit e90a8dec3a9e56357b0a934e6dd02f7b587e3161
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue May 28 15:56:39 2019 -0600

    atmos_cubed_sphere/driver/fvGFS/atmosphere.F90: improve error handling/output for CCPP fast physics

commit 43854a221fbf255cc84657b5ea567440855cf2a4
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue May 28 15:09:26 2019 -0600

    io/FV3GFS_io.F90: remove temporary filling of top four Noah levels with RUC levels when restarting from RUC LSM data

commit aefb214c4da67cfc78036523c4447092157719a3
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue May 28 15:08:33 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: add consistency check that surface data cycling is turned off when RUC LSM is used

commit 18414f2c682db5da35c8f7861d8eec29ef96b8f1
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue May 28 15:07:54 2019 -0600

    gfsphysics/GFS_layer/GFS_diagnostics.F90: write out all subsurface layers for RUC LSM; facilitate and shorten the code for writing out subsurface layers for both RUC and Noah for the CCPP version

commit 9adc6bc261764c18292a3f258a0c6d3888e36c52
Merge: 56bffa3 e79d445
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri May 24 13:59:58 2019 -0600

    Merge pull request #158 from climbfuji/remove_hybrid_ccpp

    Remove CCPP HYBRID mode

commit e79d445faf8d3d7594034ca0785a9c982a17baea
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri May 24 05:22:57 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: rearrange to match Vlab master code more closely

commit 2a61d4a9a15834eb9e02801513b2a4c472c79b0a
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu May 23 16:18:35 2019 -0600

    Remove HYBRID CCPP build

commit 56bffa38043839dd3f867aa53d943610cf6e9b13
Merge: 8657c50 83fa5b9
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu May 23 11:47:19 2019 -0600

    Merge pull request #157 from climbfuji/ccpp_cleanup_20190523

    CCPP cleanup 2019/05/23 - remove temporary files

commit 83fa5b9f7f5fd8b677635f4d76813d122fcb3c98
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu May 23 11:21:35 2019 -0600

    Remove temporary files gfsphysics/GFS_layer/GFS_typedefs.{ipd,ccpp}.F90 and remove comments to them in gfsphysics/makefile

commit 8657c5074300810430692760ce475649c3119070
Merge: 789a135 54fecdd
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu May 23 10:53:59 2019 -0600

    Merge pull request #156 from climbfuji/cleanup_ccpp_build

    CCPP cleanup 2019/05/13

commit 54fecdda7f950ef9afbe3d8700174d7ba8cfa03a
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon May 20 16:06:06 2019 -0600

    gfsphysics/makefile: remove two-step compilation of GFS_typedefs.F90, this causes compile errors with Intel (compiler bug)

commit c885e896eb0b058e82fa50345ec0ce7f07056329
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon May 20 14:06:11 2019 -0600

    TEMPORARY: add original, merged GFS physics driver as gfsphysics/GFS_layer/GFS_physics_driver.F90.original - to be deleted once a final decision is made if/how to support the hybrid mode in the transition Vlab master

commit 759af12ec9e90b915ee2bb4b7e7f48caa8cfa427
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon May 20 10:50:00 2019 -0600

    Reverse whitespace changes to FV3 code

commit 9b1bbadc5f026d6b13008ce8b37734827bea6329
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat May 18 21:15:40 2019 -0600

    Split gfsphysics/GFS_layer/GFS_typedefs.F90 into an IPD-only and a CCPP-only version, but don;t use yet; adjust makefile; revert whitespace changes in all three versions

    to merge with previous commit of GFS_typedefs.F90, change wording

commit 1249f31ac87f987597472d0127fa1ec5d7d7a03e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat May 18 19:56:45 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: adjust whitespaces to reduce differences between Vlab master and GitHub CCPP code

commit 7f46274ab1ccf5c9305beaf593ba1cb3e4545f0e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon May 13 11:51:49 2019 -0600

    Fix cleanup for CCPP build

commit 789a135d5fdff9c1ddd7e7e7f91d4737c1d435b3
Merge: 5cb1a77 b1ce882
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon May 13 09:36:32 2019 -0600

    Merge pull request #155 from climbfuji/ccpp_github_cleanup_20190509

    gmtb/ccpp cleanup in preparation for transition to VLab master - part 1

commit b1ce8822465cbb0f79ccf30b572a7be6605677e5
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sun May 12 21:28:07 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: update default settings if do_mynnedmf is true based on Joe Olson's comments

commit 67d4c1845589e2d3feac6c13e5565d4b2b58daed
Merge: d7e5bda 5cb1a77
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu May 9 13:20:31 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into ccpp_github_cleanup_20190509

commit d7e5bda53edd30076d29c598c479c4230396cf20
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu May 9 11:34:16 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: add notes for separating MYNN-specific namelist sections from general gfs_physics namelist section, set MYNN EDMF namelist options automatically, depending on do_mynnedmf

commit 5cb1a77e5767dad1367d790df63d4779e48d052d
Merge: c90dd1b 765d891
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu May 9 08:57:11 2019 -0600

    Merge pull request #154 from climbfuji/ccpp_github_update_vlab_master_20190507

    Fractional landmask changes in GFS physics

commit 765d89115070861ce60f1396f95c541ca59d4eee
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed May 8 09:04:50 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: implement HYBRID mode for GFS_surface_composites_{pre,post} schemes, comment out debugging print statements

commit 64b3c5ad4ba69e2e0ef70ed8563bddcf00cca744
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue May 7 13:20:13 2019 -0600

    Bit-for-bit work for control suite: introduce interstitial variable tice to replicate functionality in GFS_physics_driver

commit 2cfb67e6611359bd2dd4ffe6ccc418b0eebab3ea
Author: shan.sun <shan.sun@noaa.gov>
Date:   Fri May 3 20:57:21 2019 +0000

    FV3: this commits #56264: support fractional landmask on FV3 grid. No changes in results if current default non-frac landmask is used.

    CCPP modifications by @grantfirl and @climbfuji

commit c90dd1bc6956e9578fa3feb784f5078753374800
Merge: 4c5deeb 3a92202
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue May 7 08:44:27 2019 -0600

    Merge pull request #152 from climbfuji/update_gmtb-ccpp_with_gsd-develop_20190506

    Merge gsd/develop into gmtb/ccpp 2019/05/06

commit 3a922024723115e3c558221dc1e5c74c37713ea9
Merge: c70670c f2df4e3
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon May 6 10:45:18 2019 -0600

    Merge pull request #151 from climbfuji/gsd_develop_merge_in_gmtb-ccpp_20190503

    gsd/develop merge in gmtb/ccpp 2019/05/03

commit 9595fb7c1ce5fe473f26ad451fbacf2095fb3186
Merge: c70670c f2df4e3
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon May 6 10:45:18 2019 -0600

    Merge pull request #151 from climbfuji/gsd_develop_merge_in_gmtb-ccpp_20190503

    gsd/develop merge in gmtb/ccpp 2019/05/03

commit f2df4e360fbe429351a5f17a99f5656e855ea9ca
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sun May 5 08:12:36 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: define rainmin as double-precision constant in TRANSITION mode to avoid b4b mismatches of Sfcprop%sr in fv3_streched_nest versus fv3_ccpp_stretched_nest regression tests

commit 89ae0c7a2e3cf9a02af0d1a4dfd8b59a1304d7a0
Merge: c70670c 4c5deeb
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri May 3 19:38:03 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into HEAD

commit c70670cd7e21adad8f872f415644d7ed0b8408d2
Merge: 296c547 dd49b3e
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri May 3 19:27:21 2019 -0600

    Merge pull request #150 from climbfuji/update_gsd_regression_tests_20190502

    Update/cleanup gsd/develop: rename Thompson MP

commit dd49b3e2884def7346c17a1adde3a53a99066576
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri May 3 16:30:03 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: rename mp_thompson_hrrr* to mp_thompson*

commit 4c5deeb35c065d0c3d7477c9095d00a719307b9c
Merge: 9704391 e6af408
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri May 3 11:41:55 2019 -0600

    Merge pull request #148 from climbfuji/ccpp_github_update_vlab_master_20190429

    GitHub CCPP update to VLab master 2019/04/29

commit 296c547d2580612677a23b5279dcb8fc1361c6f0
Merge: 755adf0 448c46b
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu May 2 13:54:45 2019 -0600

    Merge pull request #149 from climbfuji/fix_units_fhzero_fhcyc_fhgoc3d

    gsd/develop: fix units fhzero fhcyc fhgoc3d

commit 448c46b49ba1a34fe565afafe43925a13e86785a
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu May 2 13:49:30 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: fix units of fhzero, fhcyc and fhgoc3d in metadata table and in comments

commit e6af4081918d6f2cecd73f9c5704c9ebffa38c7b
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed May 1 20:46:57 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: introduce second volatile variable for calculation of sr (Sfcprop%sr) to achieve b4b-identical results in PROD+TRANSITION mode

commit 912cec32db0a2c9a3ca2f78219696e8cc3e5568a
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Apr 29 20:05:06 2019 -0600

    namphysics/NAM_layer/NAM_restart.F90: mirror changes to gfsphysics/GFS_layer/GFS_restart.F90

commit a24a61aeb9de2f2008d5e319621d1bbbcef50cb1
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Apr 29 14:52:37 2019 -0600

    gfsphysics/physics/iccninterp.f90: update regression test name in comment

commit ca9ac1a62bd14c227d622121dd56c32209701819
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Fri Apr 26 19:29:28 2019 +0000

    FV3: this commits #61778 enhance restart capability for continuous accumulated diagnostic fields and #61740 Incorrect units in calculation of Sfcprop%srflag for GFDL-MP; adapted for CCPP version of the code

commit 97043919c20d94fa7af8eda4ab77738d656c3672
Merge: 4570d0d b8917e8
Author: grantfirl <grantf@ucar.edu>
Date:   Mon Apr 22 13:02:41 2019 -0600

    Merge pull request #145 from climbfuji/ccpp_github_update_vlab_master_20190417_BASED_ON_static_build_xml_validation_20190326

    GitHub CCPP update with VLab master changes 20190419

commit b8917e8eb0fb1ddf1a0bc10e0f63c8bae78199fc
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Apr 22 05:59:11 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: use volatile variable to calculate Sfcprop%sr for GFDL-MP in PROD+TRANSITION mode

commit 755adf03b95f77b9182510547572fdd74fc5324e
Merge: 67569ad dca8ec4
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Apr 19 20:53:51 2019 -0600

    Merge pull request #146 from climbfuji/gsd_develop_bugfix_20190419

    gsd/develop: bugfix for sncovr (compilation error)

commit dca8ec415591ec621b0209c10c0622157925abba
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Apr 19 20:46:50 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: revert removing snowc, relabel sncovr to match documentation

commit e89e6c6b9b8c3ed269646cff75755367b1eb0efb
Merge: f19edc7 4570d0d
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Apr 19 15:10:31 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into ccpp_github_update_vlab_master_20190417

commit f19edc7735ee61a6d9f777e449922c9d03b3f4e3
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Apr 19 15:10:12 2019 -0600

    Modify FV3 dynamics and fast physics routines to enable multi-gases fast physics through CCPP

commit 67569ade2cb40b30acbedaa3b785abb4e4bd365e
Merge: 563f359 4570d0d
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Apr 19 14:36:04 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into gsd_develop_merge_in_master_20190419

commit 4570d0d1e56bd448568dc0c6813204bf63a967ae
Merge: 319ac95 0b624c1
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Apr 19 13:47:22 2019 -0600

    Merge pull request #142 from climbfuji/multi_suite_static_build

    ccpp_prebuild version of multi-suite static build, cleanup validation of SDF used

commit 161b3a48ffd4b1889d06afffecdfbe9155aacfa0
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Apr 18 16:49:21 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: bugfix, add missing #endif

commit bf78d605bc6aad7a750c25cc071189610d3539eb
Author: Adam Kubaryk <Adam.Kubaryk@noaa.gov>
Date:   Wed Apr 10 19:02:34 2019 -0400

    FV3: this commit refs #60993

    Henry Juang's changes for MULTI_GASES, incorporating
    variable R and Cp for virtual temperature calculations.

    Also adds an option for tau (used in Rayleigh damping) to be negative,
    which allows for the GSM calculation of the time constant.
    Roughly, FV3 tau=0.022 is GSM tau=-10 (10-day time constant in GSM).

    Change-Id: I59edc57e8c0ec04390bc18158a96798e6c34f5a8

commit 0b624c13b89c7f617482c2b4d16e5d809e1b32bf
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Apr 16 21:18:23 2019 -0600

    makefile, ipd/makefile: remove old code, add comments

commit 5c61db24904090fa5539a64c54fb5be2de3af6ee
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Apr 16 21:17:54 2019 -0600

    gfsphysics/GFS_layer/GFS_diagnostics.F90: remove duplicate entry for sppt_wts

commit ae9676d8d2e620b160f2e81e197edc4f99a87eee
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Apr 15 14:32:13 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: bugfix, add calculation of pwat back in that got deleted mistakenly

commit 4c4e96101993e192cbc5f232c6bda1adb08b5ece
Merge: cd79ef0 319ac95
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Mon Apr 15 07:46:02 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into multi_suite_static_build

commit cd79ef030ae903b2cb3a3ef381dc50447368f535
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Apr 13 15:03:25 2019 -0600

    Multi-suite static build requires passing suite_name=trim(ccpp_suite) to ccpp_physics_{init,run,finalize}

commit 563f35971b2d74154c5c1d566dc7a64c695aca4d
Merge: 5f1cd4b 795efa5
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sat Apr 13 09:12:56 2019 +0200

    Merge pull request #141 from climbfuji/gsd_develop_thompson_improvements_and_bugfixes_20190403

    Thompson MP bug fix for saving temperature, and calculation of initial number concentrations

commit 795efa5026e30f218e891df2ef01f03deb6553dc
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Apr 12 20:55:53 2019 +0200

    gfsphysics/GFS_layer/GFS_typedefs.F90: add flag to switch on new number concentration calculation for Thompson MP

commit 319ac95d4bbb8aa3f930a93631aa13b7083db2cb
Merge: b545237 8a2c45c
Author: Laurie Carson <carson@ucar.edu>
Date:   Tue Apr 9 14:39:35 2019 -0600

    Merge pull request #140 from climbfuji/ccpp_github_update_to_vlab_master_20190406

    GitHub CCPP update to Vlab master as of 2019/04/01

commit 8a2c45c5d21c1a0c589f8e05604f9e7ea63f4ed5
Author: Raffaele Montuoro <raffaele.montuoro@noaa.gov>
Date:   Fri Mar 29 14:29:31 2019 +0000

    FV3: this commit #refs 61047 Merge FV3 chemistry development branch into master branch.

    Change-Id: I8014391ea97416ec8d757aa32ed38561b03aa679

commit 5f1cd4ba379ad17044921d93b437c55ec0a1b5d1
Merge: 696ec9b b545237
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Apr 4 10:05:02 2019 -0600

    Merge pull request #138 from NCAR/gmtb/ccpp

    Merge updates from gmtb/ccpp into gsd/develop

commit b5452373aacf4d267207c419a8a4ef298e5c6e91
Merge: aeae305 e11b0c3
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Apr 4 08:59:10 2019 -0600

    Merge pull request #137 from climbfuji/cheyenne_jet_updates_20190402

    Jet and Cheyenne build system updates, remove warning/debugging message in GFS_typedefs.F90

commit e11b0c3be01991c8e710064c9a4dd091d5f1f588
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Apr 3 14:28:51 2019 -0600

    gfsphysics/makefile: add support for AVX-512 SIMD instructions

commit 5fbde8cf5bb923cfbb2de252eef4f7148ce9196e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Apr 3 09:21:09 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: comment out warning message to avoid cluttering output

commit 696ec9bb8216f94f9a12b9ce9a143e9914fe9bac
Merge: 0dc6e0a 8a9ae3c
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Apr 2 13:06:27 2019 -0600

    Merge pull request #135 from climbfuji/update_github_ccpp_to_vlab_master_20190328

    Update GitHub gsd/develop branch with changes from Vlab master 2019/03/28

commit aeae305981d89b01c3d2e8f4fc414da2e67f23a1
Merge: 4278b5d 8a9ae3c
Author: Laurie Carson <carson@ucar.edu>
Date:   Mon Apr 1 09:24:32 2019 -0600

    Merge pull request #134 from climbfuji/update_github_ccpp_to_vlab_master_20190328

    Update GitHub CCPP branches with Vlab master 20190329

commit 8a9ae3c4e10a0233b4fc209f467732ac81fdcdd8
Merge: cf150d8 4278b5d
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Mar 30 21:25:33 2019 -0600

    Merge branch 'gmtb/ccpp' of https://github.com/NCAR/FV3 into update_github_ccpp_to_vlab_master_20190328

commit cf150d80bef72e900ab27981506f08e1794332e1
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Mar 30 21:24:21 2019 -0600

    gfsphysics/physics/physcons.F90: new constants for non-CCPP build only (for CCPP, these are defined in scheme maximum_hourly_diagnostics

commit 702d0b8a52d52fd228c1ae0ce4c59c6110cd6c13
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Mar 30 21:23:41 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: add metadata for new variables, update metadata for ldiag3d fields, add CCPP interstitial variable nsteps_per_reset, add warning to temporary allocate dq3dt to avoid crashes of CCPP static code

commit 9c7a1e92d56ee48fbefd0c689af3c119cacc7c23
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Mar 30 21:20:40 2019 -0600

    gfsphysics/GFS_layer/GFS_physics_driver.F90: remove temporary debugging code, add comments about code blocks that are not yet in CCPP, move code preceeding gwdps to gwdps_pre section, combine maximum_hourly_diagnostics code in one place, add CCPP hybrid hooks

commit a0e4a145f54bf3d1726a56aa6e9d328cb25e0599
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Mar 30 21:18:11 2019 -0600

    atmos_model.F90: remove temporary debugging code

commit ee2c8dae574017a2867c7c1e0280c46f9502ae76
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Mar 30 21:17:47 2019 -0600

    atmos_cubed_sphere/model/fv_dynamics.F90: remove temporary debugging code

commit f065e5864076282664e7c06a451b43d48aefe423
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Mar 30 21:16:44 2019 -0600

    atmos_cubed_sphere/driver/fvGFS/fv_nggps_diag.F90: portability changes for GNU compiler

commit 40998a491815e7038d63edba40586d5c6b7341da
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Sat Mar 30 21:16:12 2019 -0600

    Remove temporary debugging include files gfsphysics/GFS_layer/debug*.inc

commit 0dc6e0a83c0fefcb772c0fcd6ebdf42d933da671
Merge: 6b6f710 ebc72ad
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Mar 29 20:21:02 2019 -0600

    Merge pull request #133 from climbfuji/ccpp_github_update_to_vlab_master_20190308

    Update branch gsd/develop with Vlab master as of 03/08/2019

commit ebc72adcdce36a72fc41a354c1a11368c37540a5
Merge: 48202d6 6b6f710
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Mar 29 20:07:46 2019 -0600

    Merge branch 'gsd/develop' into ccpp_github_update_to_vlab_master_20190308

commit 4278b5d19b1238696cea26a297a7256a825472cf
Merge: 8cd10ff 48202d6
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Mar 29 10:44:16 2019 -0600

    Merge pull request #127 from climbfuji/ccpp_github_update_to_vlab_master_20190308

    Update GitHub gmtb/ccpp branch to VLab master 03/08/2019

commit 8380e40e03778dc85494939701abf4f17774f1b7
Author: Jessica.Meixner <Jessica.Meixner@noaa.gov>
Date:   Tue Mar 26 21:28:00 2019 +0000

    FV3:this commit refs #61777 sea-surface-ice-temperature fix for cplflx=t

commit 1cd2f585c7ac5ce5c3089a1c4144db75fadb6ab0
Author: Bing Fu <bing.fu@noaa.gov>
Date:   Mon Mar 25 05:12:50 2019 +0000

    FV3:this commits #refs 60897 update FV3 restart capability

    Change-Id: I62d6dab9a0fc982befdc4e1580c7a2314edb0867

commit 19c9ad6fa8c9e31317e65b9ce3d4e32d5bb07dc6
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Mon Mar 18 15:51:53 2019 +0000

    FV3: this commits #refs 60951 output physics diagnostics tendency fields to history files and #refs 60775 update qmin in cloud_diagnosis for gfdlmp

commit 17d97c01171aac2127784afaae18c20d261fa4e8
Author: Eric Aligo <eric.aligo@noaa.gov>
Date:   Mon Mar 11 17:12:17 2019 +0000

    FV3: this commits #refs 61150 Severe storm and max/min hourly diagnostics + gfdl microphysics full reflectivity only at output times

    Change-Id: I67b0b341e1637b25dc748184d0ea2bb68b16c437

commit 6b6f71095201a58c6de4678f771f750f26cdc56b
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Mar 28 20:51:05 2019 -0600

    Update CODEOWNERS for FV3's gsd/develop branch

commit b0ea58046889ea8303f20263787dcb2e2b7870e3
Merge: 8cd10ff 8ef06a4
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Mar 28 20:39:01 2019 -0600

    Merge pull request #131 from climbfuji/update_ruc_snowfallvars

    Update RUC LSM snowfall variables

commit 48202d6ec2e412b56a5c0c1862e1f87431f8f620
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Thu Mar 28 13:51:27 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: bugfix for GFDL-MP, always set indices for effective radii

commit 388a50e6cee2d227d9d9801c14e468cebd91c033
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Mar 27 17:27:32 2019 -0600

    gfsphysics/GFS_layer/GFS_typedefs.F90: add logic for non-uniform blocksizes in CCPP, including the additional logic for the CCPP hybrid code; add components to DDTs that were previously in CCPP_shared and that are required to run the GFDL-MP slow physics

commit 96798bf2089d427c49298c55b95f90055603c7fb
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Mar 27 17:25:11 2019 -0600

    gfsphysi…
  • Loading branch information
@climbfuji
climbfuji committed Nov 26, 2019
1 parent cb7e389 commit a550ddf
Show file tree
Hide file tree
Showing 6 changed files with 164 additions and 21 deletions.
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 12 files
+4 −3 physics/GFS_suite_interstitial.F90
+8 −0 physics/GFS_suite_interstitial.meta
+279 −8 physics/cu_gf_deep.F90
+323 −277 physics/cu_gf_driver.F90
+67 −0 physics/cu_gf_driver.meta
+7 −0 physics/module_MYNNrad_post.F90
+16 −0 physics/module_MYNNrad_post.meta
+7 −1 physics/module_MYNNrad_pre.F90
+16 −0 physics/module_MYNNrad_pre.meta
+8 −6 physics/module_sf_ruclsm.F90
+25 −15 physics/sfc_drv_ruc.F90
+14 −0 physics/sfc_drv_ruc.meta
83 changes: 83 additions & 0 deletions ccpp/suites/suite_FV3_GSD_SAR.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GSD_SAR" lib="ccppphys" ver="3">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>mynnrad_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>mynnrad_post</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_ruc</scheme>
<scheme>lsm_ruc_sfc_sice_pre</scheme>
<scheme>sfc_sice</scheme>
<scheme>lsm_ruc_sfc_sice_post</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>mynnedmf_wrapper</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
<scheme>mp_thompson</scheme>
<scheme>mp_thompson_post</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
13 changes: 13 additions & 0 deletions gfsphysics/GFS_layer/GFS_diagnostics.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2804,6 +2804,19 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
enddo

#ifdef CCPP
if (Model%rdlai) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'xlaixy'
ExtDiag(idx)%desc = 'leaf area index'
ExtDiag(idx)%unit = 'number'
ExtDiag(idx)%mod_name = 'gfs_sfc'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => sfcprop(nb)%xlaixy(:)
enddo
endif

if (Model%lsm == Model%lsm_ruc) then
do num = 1,Model%lsoil_lsm
write (xtra,'(i1)') num
Expand Down
47 changes: 30 additions & 17 deletions gfsphysics/GFS_layer/GFS_typedefs.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,7 @@ module GFS_typedefs
integer :: lsoil_lsm !< number of soil layers internal to land surface model
integer :: lsnow_lsm !< maximum number of snow layers internal to land surface model
integer :: lsnow_lsm_lbound!< lower bound for snow arrays, depending on lsnow_lsm
logical :: rdlai
#endif
integer :: ivegsrc !< ivegsrc = 0 => USGS,
!< ivegsrc = 1 => IGBP (20 category)
Expand Down Expand Up @@ -2321,6 +2322,11 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
Sfcprop%tsnow = clear_val
Sfcprop%snowfallac = clear_val
Sfcprop%acsnow = clear_val
!
if (Model%rdlai) then
allocate (Sfcprop%xlaixy (IM))
Sfcprop%xlaixy = clear_val
end if
end if
if (Model%do_mynnsfclay) then
! For MYNN surface layer scheme
Expand Down Expand Up @@ -2796,6 +2802,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
#ifdef CCPP
integer :: lsoil_lsm = -1 !< number of soil layers internal to land surface model; -1 use lsoil
integer :: lsnow_lsm = 3 !< maximum number of snow layers internal to land surface model
logical :: rdlai = .false.
#endif
integer :: ivegsrc = 2 !< ivegsrc = 0 => USGS,
!< ivegsrc = 1 => IGBP (20 category)
Expand Down Expand Up @@ -3078,7 +3085,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
avg_max_length, &
!--- land/surface model control
#ifdef CCPP
lsm, lsoil, lsoil_lsm, lsnow_lsm, nmtvr, ivegsrc, use_ufo, &
lsm, lsoil, lsoil_lsm, lsnow_lsm, rdlai, &
nmtvr, ivegsrc, use_ufo, &
#else
lsm, lsoil, nmtvr, ivegsrc, use_ufo, &
#endif
Expand Down Expand Up @@ -3382,6 +3390,12 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
write(0,*) 'Logic error: RUC LSM cannot be used with surface data cycling at this point (fhcyc>0)'
stop
end if
! Flag to read leaf area index from input files (initial conditions)
Model%rdlai = rdlai
if (Model%rdlai .and. .not. Model%lsm == Model%lsm_ruc) then
write(0,*) 'Logic error: rdlai = .true. only works with RUC LSM'
stop
end if
! Set surface layers for CCPP physics
if (lsoil_lsm==-1) then
Model%lsoil_lsm = lsoil
Expand Down Expand Up @@ -3834,7 +3848,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
' Boundary layer and Shallow Convection', &
' nshoc_3d=',Model%nshoc_3d, &
' nshoc_2d=',Model%nshoc_2d, &
' ntke=',Model%ntke,'shoc_parm=',shoc_parm
' ntke=',Model%ntke,' shoc_parm=',shoc_parm
endif

#ifdef CCPP
Expand Down Expand Up @@ -4437,6 +4451,7 @@ subroutine control_print(Model)
print *, ' lsm : ', Model%lsm
print *, ' lsoil : ', Model%lsoil
#ifdef CCPP
print *, ' rdlai : ', Model%rdlai
print *, ' lsoil_lsm : ', Model%lsoil_lsm
print *, ' lsnow_lsm : ', Model%lsnow_lsm
#endif
Expand Down Expand Up @@ -4867,7 +4882,7 @@ subroutine tbd_create (Tbd, IM, Model)
Tbd%snowprv = clear_val
Tbd%graupelprv = clear_val
end if

if (Model%lsm == Model%lsm_noahmp) then
allocate(Tbd%draincprv (IM))
allocate(Tbd%drainncprv (IM))
Expand Down Expand Up @@ -4902,7 +4917,7 @@ subroutine tbd_create (Tbd, IM, Model)
Tbd%qsq = clear_val
Tbd%cov = clear_val
end if

! MYJ variables
if (Model%do_myjsfc.or.Model%do_myjpbl) then
!print*,"Allocating all MYJ surface variables:"
Expand Down Expand Up @@ -6033,7 +6048,6 @@ subroutine interstitial_setup_tracers(Interstitial, Model)
Interstitial%nncl = 5
endif


if (Model%imp_physics == Model%imp_physics_mg) then
if (abs(Model%fprcp) == 1) then
Interstitial%nncl = 4 ! MG2 with rain and snow
Expand Down Expand Up @@ -6185,8 +6199,7 @@ subroutine interstitial_rad_reset (Interstitial, Model)
Interstitial%tsfg = clear_val

! F-A scheme
!if (Model%imp_physics == Model%imp_physics_fer_hires) then
if (Model%imp_physics == Model%imp_physics_fer_hires ) then
if (Model%imp_physics == Model%imp_physics_fer_hires) then
Interstitial%qv_r = clear_val
Interstitial%qc_r = clear_val
Interstitial%qi_r = clear_val
Expand Down Expand Up @@ -6768,17 +6781,17 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno)
! Print arrays that are conditional on physics choices
if (Model%imp_physics == Model%imp_physics_gfdl .or. Model%imp_physics == Model%imp_physics_thompson) then
write (0,*) 'Interstitial_print: values specific to GFDL/Thompson microphysics'
write (0,*) 'sum(Interstitial%graupelmp) = ', sum(Interstitial%graupelmp )
write (0,*) 'sum(Interstitial%icemp ) = ', sum(Interstitial%icemp )
write (0,*) 'sum(Interstitial%rainmp ) = ', sum(Interstitial%rainmp )
write (0,*) 'sum(Interstitial%snowmp ) = ', sum(Interstitial%snowmp )
write (0,*) 'sum(Interstitial%graupelmp ) = ', sum(Interstitial%graupelmp )
write (0,*) 'sum(Interstitial%icemp ) = ', sum(Interstitial%icemp )
write (0,*) 'sum(Interstitial%rainmp ) = ', sum(Interstitial%rainmp )
write (0,*) 'sum(Interstitial%snowmp ) = ', sum(Interstitial%snowmp )
!F-A scheme
else if (Model%imp_physics == Model%imp_physics_fer_hires) then
write (0,*) 'Interstitial_print: values specific to F-A microphysics'
write (0,*) 'sum(Interstitial%f_ice ) = ', sum(Interstitial%f_ice )
write (0,*) 'sum(Interstitial%f_rain ) = ', sum(Interstitial%f_rain )
write (0,*) 'sum(Interstitial%f_rimef ) = ', sum(Interstitial%f_rimef )
write (0,*) 'sum(Interstitial%cwm ) = ', sum(Interstitial%cwm )
write (0,*) 'sum(Interstitial%f_ice ) = ', sum(Interstitial%f_ice )
write (0,*) 'sum(Interstitial%f_rain ) = ', sum(Interstitial%f_rain )
write (0,*) 'sum(Interstitial%f_rimef ) = ', sum(Interstitial%f_rimef )
write (0,*) 'sum(Interstitial%cwm ) = ', sum(Interstitial%cwm )
else if (Model%imp_physics == Model%imp_physics_mg) then
write (0,*) 'Interstitial_print: values specific to MG microphysics'
write (0,*) 'sum(Interstitial%ncgl ) = ', sum(Interstitial%ncgl )
Expand Down Expand Up @@ -6808,8 +6821,8 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno)
write (0,*) 'sum(Interstitial%ncpl ) = ', sum(Interstitial%ncpl )
end if
if (Model%lsm == Model%lsm_noahmp) then
write (0,*) 'sum(Interstitial%t2mmp ) = ', sum(Interstitial%t2mmp )
write (0,*) 'sum(Interstitial%q2mp ) = ', sum(Interstitial%q2mp )
write (0,*) 'sum(Interstitial%t2mmp ) = ', sum(Interstitial%t2mmp )
write (0,*) 'sum(Interstitial%q2mp ) = ', sum(Interstitial%q2mp )
end if
write (0,*) 'Interstitial_print: end'
!
Expand Down
6 changes: 6 additions & 0 deletions gfsphysics/GFS_layer/GFS_typedefs.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2556,6 +2556,12 @@
units = count
dimensions = ()
type = integer
[rdlai]
standard_name = flag_for_reading_leaf_area_index_from_input
long_name = flag for reading leaf area index from initial conditions for RUC LSM
units = flag
dimensions = ()
type = logical
[ivegsrc]
standard_name = vegetation_type_dataset_choice
long_name = land use dataset choice
Expand Down
34 changes: 31 additions & 3 deletions io/FV3GFS_io.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,10 +513,18 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain)
nvar_s2o = 18
#ifdef CCPP
if (Model%lsm == Model%lsm_ruc .and. warm_start) then
nvar_s2r = 6
if(Model%rdlai) then
nvar_s2r = 7
else
nvar_s2r = 6
end if
nvar_s3 = 5
else
nvar_s2r = 0
if(Model%rdlai) then
nvar_s2r = 1
else
nvar_s2r = 0
endif
nvar_s3 = 3
endif
#else
Expand Down Expand Up @@ -759,6 +767,11 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain)
sfc_name2(nvar_s2m+22) = 'tsnow'
sfc_name2(nvar_s2m+23) = 'snowfall_acc'
sfc_name2(nvar_s2m+24) = 'swe_snowfall_acc'
if (Model%rdlai) then
sfc_name2(nvar_s2m+25) = 'lai'
endif
else if (Model%lsm == Model%lsm_ruc .and. Model%rdlai) then
sfc_name2(nvar_s2m+19) = 'lai'
#endif
endif

Expand Down Expand Up @@ -957,6 +970,11 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain)
Sfcprop(nb)%tsnow(ix) = sfc_var2(i,j,nvar_s2m+22)
Sfcprop(nb)%snowfallac(ix) = sfc_var2(i,j,nvar_s2m+23)
Sfcprop(nb)%acsnow(ix) = sfc_var2(i,j,nvar_s2m+24)
if (Model%rdlai) then
Sfcprop(nb)%xlaixy(ix) = sfc_var2(i,j,nvar_s2m+25)
endif
else if (Model%lsm == Model%lsm_ruc .and. Model%rdlai) then
Sfcprop(nb)%xlaixy(ix) = sfc_var2(i,j,nvar_s2m+19)
elseif (Model%lsm == Model%lsm_noahmp) then
!--- Extra Noah MP variables
#else
Expand Down Expand Up @@ -1453,7 +1471,11 @@ subroutine sfc_prop_restart_write (Sfcprop, Atm_block, Model, fv_domain, timesta
nvar2o = 18
#ifdef CCPP
if (Model%lsm == Model%lsm_ruc) then
nvar2r = 6
if (Model%rdlai) then
nvar2r = 7
else
nvar2r = 6
endif
nvar3 = 5
else
nvar2r = 0
Expand Down Expand Up @@ -1587,6 +1609,9 @@ subroutine sfc_prop_restart_write (Sfcprop, Atm_block, Model, fv_domain, timesta
sfc_name2(nvar2m+22) = 'tsnow'
sfc_name2(nvar2m+23) = 'snowfall_acc'
sfc_name2(nvar2m+24) = 'swe_snowfall_acc'
if (Model%rdlai) then
sfc_name2(nvar2m+25) = 'lai'
endif
else if(Model%lsm == Model%lsm_noahmp) then
#else
! Only needed when Noah MP LSM is used - 29 2D
Expand Down Expand Up @@ -1789,6 +1814,9 @@ subroutine sfc_prop_restart_write (Sfcprop, Atm_block, Model, fv_domain, timesta
sfc_var2(i,j,nvar2m+22) = Sfcprop(nb)%tsnow(ix)
sfc_var2(i,j,nvar2m+23) = Sfcprop(nb)%snowfallac(ix)
sfc_var2(i,j,nvar2m+24) = Sfcprop(nb)%acsnow(ix)
if (Model%rdlai) then
sfc_var2(i,j,nvar2m+25) = Sfcprop(nb)%xlaixy(ix)
endif
else if (Model%lsm == Model%lsm_noahmp) then

#else
Expand Down

0 comments on commit a550ddf

Please sign in to comment.