-
Notifications
You must be signed in to change notification settings - Fork 157
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update EMC dev/emc from NCAR dtc/develop 2019/12/17 #30
Update EMC dev/emc from NCAR dtc/develop 2019/12/17 #30
Conversation
…from NOAA-EMC ufs_public_release
68c67e2
to
5a167d4
Compare
…s_cubed_sphere, ccpp-framework, ccpp-physics
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since both Noah MP and RUC use the same variables for different precipitation types, we should save them for restart for both models. So in GFS_restart.F90, we need to add the case for Noah MP. For example,
! RUC
if (Model%lsm == Model%lsm_ruc) then
Restart%num2d = Restart%num2d + 5
endif
Changed to
! RUC and Noah MP
if (Model%lsm == Model%lsm_ruc. or. Model%lsm == Model%lsm_noahmp) then
Restart%num2d = Restart%num2d + 5
endif
For all those extra variables added to DDT sfcprop, we didn't add how to cold-start them in FV3GFS_io.F90. Also for NoahMP, we may not need to have both precip amount and precip rate, we can convert them inside land surface driver. In this way the structure looks more like RUC. |
There is another issue with Noah MP. I am not sure if we should fix with this commit or later. |
Understand. Enabling b4b identical restart runs for NoahMP is not in the scope of this PR, neither is rewriting the logic inside NoahMP. We only wanted to fix the bug that caused using zero precipitation rates at fhzero intervals. If there is an opportunity to streamline the logic used by both RUC LSM and NoahMP that also avoids writing 10 instead of 5 2d arrays to the restart files for b4b identical restart runs using NoahMP, then this will make life a lot easier in the future. But I think this work should be done by your team (we will be there to help with the CCPP part if needed) in a follow-up change. |
Good point, I think this should go together with the work that you described just before regarding streamlining the logic used for NoahMP and RUC. |
Dom, with the current modification, running fv3gfs with noah mp option can't be restarted properly. So we may use the easy fix for Noah MP precip forcing bug suggested by Moorthi: comment out the following lines in subroutine diag_phys_zero These five fields are not accumulated and no need zero out in diagnostic bucket. |
I would like @grantfirl's opinion on this one as well. I believe that without/before our modifications, NoahMP couldn't be restarted properly as well? Is it the purpose of this PR to fix it? |
Dom,
Before your modification, Noah MP can be restarted properly because those
five precip variables in DDT Diag are stored in restart files. After your
modification, Noah MP will use the data from DDT Sfcprop. However they are
not stored in restart file for Noah MP.
Helin
…On Wed, Jan 8, 2020 at 10:10 PM Dom Heinzeller ***@***.***> wrote:
Dom, with the current modification, running fv3gfs with noah mp option
can't be restarted properly. So we may use the easy fix for Noah MP precip
forcing bug suggested by Moorthi:
comment out the following lines in subroutine diag_phys_zero
Diag%rain = zero
Diag%rainc = zero
Diag%ice = zero
Diag%snow = zero
Diag%graupel = zero
These five fields are not accumulated and no need zero out in diagnostic
bucket.
I would like @grantfirl <https://github.com/grantfirl>'s opinion on this
one as well. I believe that without/before our modifications, NoahMP
couldn't be restarted properly as well? Is it the purpose of this PR to fix
it?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#30?email_source=notifications&email_token=ALPHKYAFKBIDYP2KJLVIFV3Q42IS7A5CNFSM4J4MTIYKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIOY62A#issuecomment-572362600>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALPHKYBLT66TEGRWFMAT2SLQ42IS7ANCNFSM4J4MTIYA>
.
|
I am sorry but I am confused. Where are the five diag variables written to the restart files? If you check GFS_restart.F90, then you see that the five variables that were previously in Tbd and now in Sfcprop are written to the restart files. I checked FV3GFS_io.F90 and GFS_restart.F90, and I don't see any place where IntDiag fields are written to restart files. I also checked the restart output in the EMC baseline for the NoahMP test, |
I think you are right. We have the restarting issue for Noah MP before and
after your modifications. Noah MP with FV3GFS still has some other issues
need to be fixed. Therefore we should have another PR exclusively to
address all remaining issues for Noah MP. I will recommend Jun to go ahead
and commit your changes. Thanks.
…On Wed, Jan 8, 2020 at 10:43 PM Dom Heinzeller ***@***.***> wrote:
Dom, Before your modification, Noah MP can be restarted properly because
those five precip variables in DDT Diag are stored in restart files. After
your modification, Noah MP will use the data from DDT Sfcprop. However they
are not stored in restart file for Noah MP. Helin
… <#m_-5465603627119123655_>
I am sorry but I am confused. Where are the five diag variables written to
the restart files? If you check GFS_restart.F90, then you see that the five
variables that were previously in Tbd and now in Sfcprop are written to the
restart files. I checked FV3GFS_io.F90 and GFS_restart.F90, and I don't see
any place where IntDiag fields are written to restart files. I also checked
the restart output in the EMC baseline for the NoahMP test,
/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20191127/fv3_gfdlmprad_noahmp/RESTART.
I don't see any file containing those five precipitation fields. I must be
missing something. Can you please point me to the lines of code that are
writing these IntDiag fields to disk in the current develop branch of
fv3atm? Thanks!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#30?email_source=notifications&email_token=ALPHKYFECV2SAJPTGF3ZR7DQ42MOJA5CNFSM4J4MTIYKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIO22KQ#issuecomment-572370218>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALPHKYDPLMY5BS4EFWNTNTLQ42MOJANCNFSM4J4MTIYA>
.
|
Thanks for checking, Helin. It's always good to have more eyes looking at the code. |
I only go through two directories which are physics related, and compared the contents between Dom's fork and the current UFS repository. The directories are: |
@@ -3698,7 +3869,7 @@ subroutine GFS_physics_driver & | |||
|
|||
else ! ras version 2 | |||
|
|||
! DH* this code not yet in CCPP (belongs to GFS_DCNV_generic_pre?) | |||
!## CCPP ##* This code not yet in CCPP Note: Likely belongs in rascnv_pre. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have moved this calculation inside RAS itself. There is no need for rascnv_pre
! if (lprnt) write(0,*)' gt04bras=',Stateout%gt0(ipr,:) | ||
! if (lprnt) write(0,*)' gq04bras=',Stateout%gq0(ipr,:,1) | ||
! if (lprnt) write(0,*)'befrasclw1=',clw(ipr,:,1) | ||
! if (lprnt) write(0,*)'befrasclw2=',clw(ipr,:,2) | ||
! if (lprnt) write(0,*)'befrastke=',clw(ipr,:,ntk) | ||
! if (lprnt) write(0,*)'trcmin=',trcmin(ntk-2),' ntk=',ntk | ||
|
||
!## CCPP ## Not in CCPP yet. | ||
call rascnv (im, ix, levs, dtp, dtf, Tbd%rann, Stateout%gt0, & |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is now in my ccpp fork.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only go through two directories which are physics related, and compared the contents between Dom's fork and the current UFS repository. The directories are:
ufs-weather-model-DOM/FV3/gfsphysics
ufs-weather-model-DOM/FV3/ccpp
There are few changes in the IPD driver and its related physics schemes. All the changes look fine to me. The major changes are CCPP related. There are several new schemes (new suites) in Dom's fork. These new schemes (new suites) can only be called using CCPP, not through IPD driver. In Dom's fork, some of the post_runs are merged into GFS_GWD_generic_post, so developers need to update their SDF if they have not committed their suite to the CCPP repository. All the changes look fine to me, but I can't say much to the changes of the physics schemes which I am not familiar with (for example, sfc_drv_ruc.F90). Since all the regression tests are successful, I think it is fine to merge Dom's fork to the EMC repository.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks ok to me.
Thanks, Moorthi. I suggest to update the comments in GFS_physics_driver.F90 when your RAS-CCPP work is merged. OK? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code changes look good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved, based on other people's reviews.
Update EMC dev/emc from NCAR dtc/develop 2019/12/17 (NOAA-EMC#30)
…00312_and_other_changes Update from emc/develop 2020/03/12 and other changes
Squashed commit of the following: commit a77f292f7eab4f6e5f24dc3af5f8a71fe4cf9347 Merge: 070386e0 722339d1 Author: Man.Zhang <Man.Zhang@noaa.gov> Date: Mon Mar 16 10:30:11 2020 -0600 Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAFS_fer_hires commit 070386e0d18762d57483fa699408f2265d2e3887 Author: Man.Zhang <Man.Zhang@noaa.gov> Date: Mon Mar 16 10:00:33 2020 -0600 delete optional vars related to FA scheme commit 722339d1cfa75cc63dedde486c733f3907a716ac Merge: e88f2b37 fcb13133 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Fri Mar 13 13:05:52 2020 -0600 Merge pull request #30 from climbfuji/update_from_dev_emc_20200312_and_other_changes Update from emc/develop 2020/03/12 and other changes commit fcb131337e5d0091440db93ce004b2339b3ccc3d Author: Dom Heinzeller <climbfuji@ymail.com> Date: Fri Mar 13 13:04:05 2020 -0600 Revert change to .gitmodules, update submodule pointers for GFDL_atmos_cubed_sphere and ccpp-physics commit 872b8fc90354ab4c84be14ae310865aa323bca5a Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Mar 12 20:57:19 2020 -0600 gfsphysics/GFS_layer/GFS_typedefs.F90: bugfix for declaration of variable radar_reset commit 1b5bd6e55c038f01a8e8e39ce0fae330ab4be850 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Mar 12 13:38:50 2020 -0600 Update .gitmodules for code review and testing commit 67c8b06418730d2672b68562dc111c0b48271822 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Mar 12 13:13:57 2020 -0600 Add nsradar_reset to control resetting radar calculations for Thompson MP commit 6d3399bf8fa0942e5524321ac7e22b7091c7d36b Merge: 4e545798 e88f2b37 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Mar 12 13:13:12 2020 -0600 Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into update_from_dev_emc_20200312_and_other_changes commit e88f2b37b4607b739448a8c82c50f825529ecf9c Merge: 1a385e35 cc085c72 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Thu Mar 12 13:08:46 2020 -0600 Merge pull request #29 from climbfuji/merge_emc_develop_20200311_after_moorthi_before_dycore_pr7 dtc/develop: merge emc/develop 2020/03/11 (after Moorthi's commit, before dycore OMP bugfix) commit cc085c7244a810cdeeed0f41f3bffccba2fdc6bb Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Mar 12 13:07:54 2020 -0600 Revert change .gitmodules and update submodule pointer for ccpp/physics commit d97b557dbe46343a66835467e9cd82aa33dc936a Author: Man.Zhang <Man.Zhang@noaa.gov> Date: Thu Mar 12 11:06:17 2020 -0600 add optional vars in FA to prebuild script commit 4e5457980b817588c185f457d714d9ce9d162225 Merge: 2de5048f fc9a4c21 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Mar 12 10:39:17 2020 -0600 Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into merge_emc_develop_20200311_after_moorthi_before_dycore_pr7 commit 2de5048fe31645d7773aa643aef77653b694a426 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Mar 12 08:46:13 2020 -0600 Update .gitmodules for code review commit 250704553bbfce541a76e53d33614eac6b3ecf49 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Mar 12 08:37:02 2020 -0600 Add moninedmf_hafs.f to CCPP prebuild config commit 3375ede9c7a567e37e1db01a22b2ba41bf701d7a Merge: 1a385e35 38a495ee Author: Dom Heinzeller <climbfuji@ymail.com> Date: Wed Mar 11 10:25:31 2020 -0600 Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD commit 793719b602a9bfdd14d599e5163c152bee0b250d Merge: 0a0d3344 1a385e35 Author: Man.Zhang <Man.Zhang@noaa.gov> Date: Wed Mar 11 10:20:02 2020 -0600 Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAFS_fer_hires commit 1a385e35988e34035010931af9d8229ae5cabd83 Merge: 756ef51a c6e17ef0 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Mon Mar 9 12:43:32 2020 -0600 Merge pull request #27 from climbfuji/update_dtc_develop_from_emc Update dtc/develop from emc/develop 2020/03/04 commit c6e17ef0f904f896dee6aceda6de57126c48f675 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Mon Mar 9 12:42:42 2020 -0600 Revert change to .gitmodules, update submodule pointer for atmos_cubed_sphere commit 0a0d334483ef2f0f368f8e0e3767b0ca30de09e4 Merge: 3908b386 756ef51a Author: Man.Zhang <Man.Zhang@noaa.gov> Date: Sun Mar 8 10:21:03 2020 -0600 Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAFS_fer_hires commit bf5bfa1957d3684f3372f93a1cc3ac3a63a6d923 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Wed Mar 4 09:34:36 2020 -0700 Update submodule pointer for .gitmodules for code review and testing commit 5c6bd37e09b586fa1ae3e34c5d6b27b68858c7b9 Merge: 756ef51a 8683a693 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Fri Feb 28 08:49:20 2020 -0700 Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD commit 756ef51a99efefac0db3f9fe53da207ca9306ee1 Merge: 9de2a9da cf0fad6c Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Thu Feb 6 13:37:01 2020 -0700 Merge pull request #25 from climbfuji/dom_combine_prs_20200204 dtc/develop: combined PRs for ccpp-framework and ccpp-physics commit cf0fad6c59325201c6a345087ff4cf6793a30c94 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Feb 6 13:33:19 2020 -0700 Revert change to .gitmodules, update submodule pointers for ccpp-framework and ccpp-physics commit b2614a4d853e100a9f454d29c2f37d309687ca0e Author: Dom Heinzeller <climbfuji@ymail.com> Date: Tue Feb 4 17:19:51 2020 -0700 Update .gitmodules and submodule pointers for code review and testing commit 9de2a9da7b6a16154c6f1908b16948692166aa69 Merge: e14e81fd 35bbaf70 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Mon Feb 3 07:48:46 2020 -0700 Merge pull request #24 from climbfuji/update_dtc_develop_from_develop dtc/develop: update from develop 2020/01/27 commit 35bbaf70594198671c67040a20c4aefcd36ccdbe Author: Dom Heinzeller <climbfuji@ymail.com> Date: Mon Feb 3 07:45:43 2020 -0700 Revert .gitmodules change, update submodule pointers commit 92341280c61724c8eada0dcb87136ed1478e501b Author: Dom Heinzeller <climbfuji@ymail.com> Date: Mon Jan 27 09:42:55 2020 -0700 Update .gitmodules for code review and testing commit 77e0957f64380e07a87856982ec78430e56e6cb9 Merge: e14e81fd 7ffe6471 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Mon Jan 27 09:41:52 2020 -0700 Merge branch 'develop' of https://github.com/noaa-emc/fv3atm into HEAD commit e14e81fd2cab47ab993eb8f4bd9dfc07c74e5654 Merge: 6353b7c7 fa72e2b0 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Thu Dec 26 07:59:59 2019 -0700 Merge pull request #22 from climbfuji/sar_fix_hrrr_ics Bug fix in io/FV3GFS_io.F90 for RUC LSM with RAP/HRRR initial data commit fa72e2b054d4d383a2c482cf5fc9a1f27f850e71 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Mon Dec 23 14:35:24 2019 -0700 io/FV3GFS_io.F90: bugfix for cold starts from RAP/HRRR initial conditions commit 3908b386801502de7727b9c0aaa918e3f652742a Merge: fc1bc3d5 6353b7c7 Author: Man.Zhang <Man.Zhang@noaa.gov> Date: Thu Dec 19 09:45:40 2019 -0700 Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAFS_fer_hires commit 6353b7c75e6b6c90371caf5ef542eb2e20ef3e8e Merge: 153ae61d 9228d4ca Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Tue Dec 17 15:46:15 2019 -0700 Merge pull request #21 from climbfuji/update_dtc_develop_from_ufs_public_release_20191216 Update dtc develop from EMC develop and ufs_public_release 2019/12/16 commit 9228d4ca4bcd8bf9022d23739c4f1248c1955c8b Author: Dom Heinzeller <climbfuji@ymail.com> Date: Mon Dec 16 07:19:22 2019 -0700 Updates from ufs_public_release: use correct NETCDF variable for new cmake build, rename suite FV3_GFS_v15.2 to FV3_GFS_v15p2 commit d0a75a94739c8287f667e1c728964824f540fcea Merge: 52642725 8a567812 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Sat Dec 14 07:07:47 2019 -0700 Merge branch 'develop' of https://github.com/noaa-emc/fv3atm into HEAD commit 153ae61d6227cda619d56a53832fadf5a54d1384 Merge: 52642725 38b88348 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Thu Dec 12 09:36:17 2019 -0700 Merge pull request #20 from grantfirl/fix_GFS_v15p2_name change suite_FV3_GFS_v15.2 to suite_FV3_GFS_v15p2 commit 38b88348105a4ccbbdefe763411ba0e52b3740b6 Author: Grant Firl <grantf@ucar.edu> Date: Thu Dec 12 09:33:33 2019 -0700 change suite_FV3_GFS_v15.2 to suite_FV3_GFS_v15p2 commit fc1bc3d5f47de906737576fb20284e2859d59581 Merge: ad49383c 52642725 Author: Man.Zhang <Man.Zhang@noaa.gov> Date: Wed Dec 11 12:58:05 2019 -0700 Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAFS_fer_hires commit 52642725bf69213c9766846b470f1812076d3541 Merge: 88e87e9b fd8b1d6a Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Mon Dec 9 11:04:33 2019 -0700 Merge pull request #15 from climbfuji/update_dtc_develop_from_emc_develop_and_collect_updates_20191205 Update dtc/develop from EMC develop and collect updates 2019/12/05 commit fd8b1d6aefe552ad2d5d1fff8a443f4e8f04269c Author: Dom Heinzeller <climbfuji@ymail.com> Date: Mon Dec 9 11:04:03 2019 -0700 Update submodule pointer for ccpp/physics commit 1c7f2c1d0319cd4cbb14aef4dcb6cff2019ad09e Merge: 37800303 718b7a50 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Fri Dec 6 12:51:13 2019 -0700 Merge branch 'fix_cires_ugwp_dimension_bug' of https://github.com/grantfirl/fv3atm into update_dtc_develop_from_emc_develop_and_collect_updates_20191205 commit 718b7a5086ae259cbff2f53dbed7913e67a60377 Author: Grant Firl <grantf@ucar.edu> Date: Fri Dec 6 12:45:15 2019 -0700 fix cires_ugwp_init call arguments in GFS_driver.F90 (there is no issue in CCPP version) commit 378003032b675a797c787eb0091f2e49eea78d43 Merge: b317eae9 aa99bea5 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Fri Dec 6 11:03:40 2019 -0700 Merge branch 'fix_cires_ugwp_dimension_bug' of https://github.com/grantfirl/fv3atm into update_dtc_develop_from_emc_develop_and_collect_updates_20191205 commit b317eae93c5ec204113a0d9ef18de1fba85db543 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Fri Dec 6 10:59:40 2019 -0700 Bugfixes for NoahMP precipitation rate PR commit aa99bea5af49f2ca0ecb38114d4adc455f4c75e8 Author: Grant Firl <grantf@ucar.edu> Date: Fri Dec 6 10:30:13 2019 -0700 fix array dimensions for phii, prsi in ugwp_driver_v0.F commit 3be9f9899755379311b64181ca2df9a3bace4b2f Merge: 41884c2b d373518c Author: Dom Heinzeller <climbfuji@ymail.com> Date: Fri Dec 6 07:48:36 2019 -0700 Merge branch 'dtc/develop' of https://github.com/panll/fv3atm into update_dtc_develop_from_emc_develop_and_collect_updates_20191205 commit 41884c2b3226c755bb56b4a94d2be0db0afde13b Merge: 0a292c4e eb4c2e05 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Fri Dec 6 07:44:01 2019 -0700 Merge branch 'fix_noahmp_precip_rates' of https://github.com/grantfirl/fv3atm into update_dtc_develop_from_emc_develop_and_collect_updates_20191205 commit eb4c2e05ef06e464b9ce46d924d6dee58b7f6a10 Author: Grant Firl <grantf@ucar.edu> Date: Thu Dec 5 22:18:03 2019 -0700 make associated change to GFS_physics_driver for NoahMP precip rates commit d373518cb7fbf196411bd13df020d19ca79d50ca Author: Linlin.Pan <Linlin.Pan@noaa.gov> Date: Fri Dec 6 00:11:30 2019 +0000 adding new suit files for GFS v15.2 and GFS v16beta commit 9f728649a3344ebfdd93f4701b54f6f83a027bce Author: Linlin.Pan <Linlin.Pan@noaa.gov> Date: Fri Dec 6 00:00:34 2019 +0000 update the suite file for coupling removing <scheme>samfshalcnv_post</scheme> adding <scheme>GFS_GWD_generic_post</scheme> commit 0a292c4e7ad7e40ae5216a6248ae658b0336fb9d Merge: 88e87e9b 26de321b Author: Dom Heinzeller <climbfuji@ymail.com> Date: Thu Dec 5 15:40:02 2019 -0700 Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD commit ad49383c19fa17abc16598dee755b178fffb98bf Merge: 78e06cb2 88e87e9b Author: Man.Zhang <Man.Zhang@noaa.gov> Date: Thu Dec 5 13:10:26 2019 -0700 Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into HAFS_fer_hires commit c9322aa19776e69ba18b116739dee07425989df1 Author: Grant Firl <grantf@ucar.edu> Date: Thu Dec 5 13:06:51 2019 -0700 change RUC surface precip vars to Sfcprop DDT in GFS_restart.F90 commit 66c70012a2eea36fcece6b812b32f891d9163ff8 Author: Grant Firl <grantf@ucar.edu> Date: Thu Dec 5 12:58:37 2019 -0700 remove sfc_noahmp_pre interstitial scheme from prebuild and SDF, move precip variables needed by LSMs from TBD DDT to Sfcprop DDT commit 3aacc00f36c90ab2997c6203e1862a5fe0b4a7e7 Author: Linlin.Pan <Linlin.Pan@noaa.gov> Date: Wed Dec 4 20:23:59 2019 +0000 changing ccpp/suites/suite_FV3_GFS_2017_couple.xml to ccpp/suites/suite_FV3_GFS_2017_coupled.xml commit 88e87e9bd063d8d02fd7830db77a623b6533bb9a Merge: bc316893 eae67862 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Tue Dec 3 15:22:43 2019 -0700 Merge pull request #11 from climbfuji/dtc_develop_udpate_from_emc_20191127 dtc/develop: update from EMC 2019/11/27 commit eae67862e08a1285d4e2029aa8312f6d6d3ec7d8 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Tue Dec 3 15:22:19 2019 -0700 Update submodule pointers for atmos_cubed_sphere, ccpp/framework, ccpp/physics commit 8b23f662cdc9eccb2bc4ddf31f3b7baebfb19c0c Author: Linlin.Pan <Linlin.Pan@noaa.gov> Date: Tue Dec 3 16:35:55 2019 +0000 adding updated suite for coupling ccpp/suites/suite_FV3_GFS_2017_couple.xml commit 2de4377fddeaf2c8d58202e8fef54274b313092c Author: Dom Heinzeller <climbfuji@ymail.com> Date: Mon Dec 2 11:02:38 2019 -0700 Update submodule pointers for ccpp-framework and ccpp-physics commit ac71e234cbecf8e7b516e6fafc7872d1bf45b009 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Fri Nov 29 17:03:49 2019 -0700 ccpp/CMakeLists.txt: add flag '-Wall' to DEBUG flags for GNU compiler commit 9caa172aaf8757dadc2590d2599706e00225bf51 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Wed Nov 27 14:33:32 2019 -0700 Update submodule pointer for ccpp/physics commit 03f7d7815cd4b2ed4d2226be64dcef22b6a06d44 Merge: bc316893 ea91f650 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Wed Nov 27 14:26:39 2019 -0700 Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD commit bc316893a123a9437642497f417fa2217491efdb Merge: cb7e3891 661e98c2 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Wed Nov 27 13:42:34 2019 -0700 Merge pull request #10 from climbfuji/merge_gsd_develop_and_update_basedir_builddir_logic dtc/develop: merge gsd/develop, update CCPP prebuild config commit 661e98c2833876e1de26989bb470fdf73730415e Author: Dom Heinzeller <climbfuji@ymail.com> Date: Wed Nov 27 13:41:25 2019 -0700 Update submodule pointers for ccpp/framework and ccpp/physics commit 07af073d0260e203433e96720e8572ce688e0697 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Tue Nov 26 11:58:13 2019 -0700 Update submodule pointers for ccpp-framework and ccpp-physics commit 1688b2990cde67a4637b34a9b9628296db0314e5 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Tue Nov 26 11:57:51 2019 -0700 ccpp/config/ccpp_prebuild_config.py: add new configuration item DEFAULT_BUILD_DIR commit a550ddf96f6052fad2d1d002a58dec2c2fff7277 Author: Dom Heinzeller <climbfuji@ymail.com> Date: Tue Nov 26 08:42:25 2019 -0700 Merge FV3 gsd/develop into fv3atm dtc/develop, squashed commit of the 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 …
…a_structures gsd/develop: handle blocked data structures in init and finalize routines, remove pset logic, metadata cleanup
* Bugfix in tools/fv_diagnostics.F90: correct dimensions of delz in several routines
This PR contains:
GFS_driver.F90
,GFS_radiation_driver.F90
,GFS_physics_driver.F90
(comments that describe where code blocks ended up in the CCPP interstitial code)Associated PRs:
NOAA-EMC/GFDL_atmos_cubed_sphere#11
NCAR/ccpp-framework#246
NCAR/ccpp-physics#372
#30
ufs-community/ufs-weather-model#18
For regression testing, see ufs-community/ufs-weather-model#18.