From 34b4503062be156d6d08ff04a1b50f4857757fb6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 14 Apr 2020 07:30:18 -0600 Subject: [PATCH 1/2] Merge NCAR:dtc/develop into NOAA-EMC:dev/emc - bugfix for GNU compiler - reduce noise in stdout Squashed commit of the following: commit 86c127f5b810b87004aeed3a625f9445d469c27e Merge: ce66d6a f9bbb4f Author: Dom Heinzeller Date: Fri Apr 10 11:32:21 2020 -0600 Merge pull request #11 from climbfuji/update_dtc_develop_from_dev_emc_20200409 Update dtc/develop from dev/emc 2020/04/09 commit f9bbb4f12e032378050cef4b7e5ac4b65a16bb70 Author: Dom Heinzeller Date: Thu Apr 9 20:14:24 2020 -0600 Bugfix for GNU compiler in model/fv_regional_bc.F90, reduce verbosity in driver/fvGFS/atmosphere.F90 commit ecca9978802ec9cc39dc114fd7363386f7ad9422 Merge: ce66d6a 80ce8ce Author: Dom Heinzeller Date: Thu Apr 9 09:38:48 2020 -0600 Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD commit ce66d6a56e89b6330a2bef763755c7154047d829 Merge: 4279bf7 9bacf55 Author: Dom Heinzeller Date: Fri Mar 13 13:00:41 2020 -0600 Merge pull request #10 from climbfuji/update_from_dev_emc_20200312_and_other_changes Update from dev/emc 2020/03/12 commit 9bacf554ed078dfa8c09ee662e7608442288e2d5 Merge: 4279bf7 371a29a Author: Dom Heinzeller Date: Thu Mar 12 10:33:44 2020 -0600 Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD commit 4279bf78eb4ae0bad908eb991e3fb216018b7aea Merge: 846f5a5 4858d33 Author: Dom Heinzeller Date: Mon Mar 9 12:41:51 2020 -0600 Merge pull request #9 from climbfuji/update_dtc_develop_from_emc Update dtc/develop from dev/emc 2020/03/04 commit 4858d33838adcd87c1cd000ab4737dc0e7e56731 Merge: 846f5a5 db3acfb Author: Dom Heinzeller Date: Fri Feb 28 08:46:55 2020 -0700 Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD commit 846f5a54b0764db1478c9aca49a74bd38322d9ad Merge: 3a4dfd8 9a290ee Author: Dom Heinzeller Date: Mon Feb 3 07:43:08 2020 -0700 Merge pull request #7 from climbfuji/update_dtc_develop_from_dev-emc dtc/develop: update from dev/emc 2020/01/27 commit 9a290ee5f3307a9d7b02762fe6c29a1f5ccd7f55 Merge: 3a4dfd8 a56907a Author: Dom Heinzeller Date: Mon Jan 27 09:28:57 2020 -0700 Merge branch 'dev/emc' of https://github.com/noaa-emc/GFDL_atmos_cubed_sphere into HEAD commit 3a4dfd8c6c4ceb8cec06397f25cb229ecd98065b Merge: 0c9ab9e 68576a6 Author: Dom Heinzeller Date: Tue Dec 3 15:19:24 2019 -0700 Merge pull request #6 from climbfuji/dtc_develop_udpate_from_emc_20191127 dtc/develop: update from EMC 2019/11/27 commit 68576a61f2a57236931e5ef1b8bd73a4256b0a5f Merge: 0c9ab9e 452333a Author: Dom Heinzeller Date: Wed Nov 27 14:13:08 2019 -0700 Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD commit 0c9ab9e3dfe6cda6fc78315b86a107a369756024 Merge: 9871607 b280b37 Author: Dom Heinzeller Date: Fri Nov 22 16:17:57 2019 -0700 Merge pull request #5 from mzhangw/HAFS_fer_hires minimal changes to make nwat =4 compatible with Ferrier-Aligo MP scheme commit b280b373b421fcb9d84bd1196a40ec56fcf279ff Author: Man.Zhang Date: Tue Nov 19 14:53:57 2019 -0700 bug fix commit 98c58ad3d0444859aae54c31bc2b86ba30b4a9ac Author: Man.Zhang Date: Tue Nov 19 14:35:10 2019 -0700 bug fix commit 8805acd93152bb76d5c4d0900f314631f549fbe2 Author: Man.Zhang Date: Tue Nov 19 14:16:22 2019 -0700 From Chunxi: The file fv_mapz.F90 also needs to be modified (K_warm) commit f8a257a922a9047e98c176affec054e2a4d9c6a9 Author: Man.Zhang Date: Thu Nov 14 19:12:39 2019 -0700 use upper-case CCPP commit 77f4fbad9311ad406c6486ad0912069de3085f07 Author: Man.Zhang Date: Thu Nov 14 13:40:59 2019 -0700 implement FA scheme water loading option if nwat =4 commit 987160799b3a1c0f11de9883843f20421eb03fe8 Merge: ed75004 786447c Author: Dom Heinzeller Date: Tue Nov 5 06:59:34 2019 +0900 Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere into HEAD commit ed75004634374b02f8b222dd873190a91126ce4f Merge: 1d6035a f627bfb Author: Dom Heinzeller Date: Sat Oct 12 08:45:14 2019 +0900 Merge pull request #4 from climbfuji/update_gmtb_develop_with_vlab_master_20191006 Update NCAR gmtb/develop with NOAA-EMC dev/emc 2019/10/06 commit f627bfb177dc1f2d0bd10371540c43c51ce8eec4 Author: Dom Heinzeller Date: Mon Oct 7 12:12:24 2019 +0900 Add missing change in fv_cmp.F90 - now identical with EMC code commit e868186fd7d64fc2eeb7ec2c59e88c889e62fc93 Author: Dusan Jovic Date: Tue Sep 24 01:57:11 2019 +0000 change delz from positive value to the original value in the model commit 672eb0e8d67c008437724681250e7aa8aa81ec31 Author: fanglin.yang Date: Thu Sep 5 19:24:09 2019 +0000 VLab Issue #68141 modified: docs/FV3_citations.bib modified: model/fv_cmp.F90 1) Add an option (namelist parameter: intqs) to use temperature instead of the liquid frozen temperature to calculate saturation mixing ratio in deriving GFDLMP PDF cloud cover. 2) Add a literature reference. commit 1d6035ab053a6b5257b32dd9b4a49faa7ee4c78d Merge: 94ab0e1 fec8205 Author: Dom Heinzeller Date: Mon Sep 23 09:32:55 2019 -0600 Merge pull request #2 from climbfuji/remove_transition_mode Remove TRANSITION mode commit fec8205b9418dea28de4e2c9f05f347f3cf460d2 Author: climbfuji Date: Fri Sep 20 08:52:01 2019 -0600 Remove TRANSITION mode commit 94ab0e1317ffa50279dd6269a462999a2bea15e7 Author: Jun.Wang Date: Mon Aug 26 21:03:55 2019 +0000 add option to output omega commit b700cae673038f82189a1e6e0cb48a10a58ea726 Author: climbfuji Date: Fri Aug 30 11:58:00 2019 -0600 model/fv_dynamics.F90: replicating previous change to gmtb/develop branch of FV3, always allocate dtdt_m for IPD version commit 3df11713e0ba9299d95512476a9ee784048629c9 Author: Laurie Carson Date: Fri Aug 16 10:46:56 2019 -0600 Add codeowners for NCAR fork --- driver/fvGFS/atmosphere.F90 | 4 ++-- model/fv_regional_bc.F90 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/driver/fvGFS/atmosphere.F90 b/driver/fvGFS/atmosphere.F90 index d1ed7e005..6cbd71756 100644 --- a/driver/fvGFS/atmosphere.F90 +++ b/driver/fvGFS/atmosphere.F90 @@ -112,7 +112,7 @@ module atmosphere_mod ! ! mpp_mod ! mpp_error, stdout, FATAL, NOTE, input_nml_file, mpp_root_pe, -! mpp_npes, mpp_pe, mpp_chksum,mpp_get_current_pelist, +! mpp_npes, mpp_pe, mpp_chksum,mpp_get_current_pelist, ! mpp_set_current_pelist ! ! @@ -1269,7 +1269,7 @@ subroutine atmosphere_get_bottom_layer (Atm_block, DYCORE_Data) rrg = rdgas / grav if (first_time) then - print *, 'calculating slp kr value' + if (mpp_pe() == mpp_root_pe()) print *, 'calculating slp kr value' ! determine 0.8 sigma reference level sigtop = Atm(mytile)%ak(1)/pstd_mks+Atm(mytile)%bk(1) do k = 1, npz diff --git a/model/fv_regional_bc.F90 b/model/fv_regional_bc.F90 index f73ee8909..9bd8e2b8a 100644 --- a/model/fv_regional_bc.F90 +++ b/model/fv_regional_bc.F90 @@ -5539,14 +5539,14 @@ subroutine create_restart_with_bcs(Atm) ,'yaxis_1' & ,'yaxis_2' & ,'zaxis_1' & - ,'Time' & + ,'Time ' & /) ! character(len=9),dimension(ndims_tracers) :: dim_names_tracers=(/ & 'xaxis_1' & ,'yaxis_1' & ,'zaxis_1' & - ,'Time' & + ,'Time ' & /) ! !----------------------------------------------------------------------- From ed226dd83675aa330337709f7125026c95a15da3 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 14 Apr 2020 07:56:17 -0600 Subject: [PATCH 2/2] Delete print statement in driver/fvGFS/atmosphere.F90 --- driver/fvGFS/atmosphere.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/driver/fvGFS/atmosphere.F90 b/driver/fvGFS/atmosphere.F90 index 6cbd71756..046e2a5f1 100644 --- a/driver/fvGFS/atmosphere.F90 +++ b/driver/fvGFS/atmosphere.F90 @@ -1269,7 +1269,6 @@ subroutine atmosphere_get_bottom_layer (Atm_block, DYCORE_Data) rrg = rdgas / grav if (first_time) then - if (mpp_pe() == mpp_root_pe()) print *, 'calculating slp kr value' ! determine 0.8 sigma reference level sigtop = Atm(mytile)%ak(1)/pstd_mks+Atm(mytile)%bk(1) do k = 1, npz