Skip to content

Commit

Permalink
Merge NCAR:dtc/develop into NOAA-EMC:dev/emc
Browse files Browse the repository at this point in the history 
- bugfix for GNU compiler
- reduce noise in stdout

Squashed commit of the following:

commit 86c127f
Merge: ce66d6a f9bbb4f
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
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 f9bbb4f
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 20:14:24 2020 -0600

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

commit ecca997
Merge: ce66d6a 80ce8ce
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 09:38:48 2020 -0600

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

commit ce66d6a
Merge: 4279bf7 9bacf55
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
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 9bacf55
Merge: 4279bf7 371a29a
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 12 10:33:44 2020 -0600

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

commit 4279bf7
Merge: 846f5a5 4858d33
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
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 4858d33
Merge: 846f5a5 db3acfb
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Feb 28 08:46:55 2020 -0700

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

commit 846f5a5
Merge: 3a4dfd8 9a290ee
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
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 9a290ee
Merge: 3a4dfd8 a56907a
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Jan 27 09:28:57 2020 -0700

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

commit 3a4dfd8
Merge: 0c9ab9e 68576a6
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
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 68576a6
Merge: 0c9ab9e 452333a
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Nov 27 14:13:08 2019 -0700

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

commit 0c9ab9e
Merge: 9871607 b280b37
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
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 b280b37
Author: Man.Zhang <Man.Zhang@noaa.gov>
Date:   Tue Nov 19 14:53:57 2019 -0700

    bug fix

commit 98c58ad
Author: Man.Zhang <Man.Zhang@noaa.gov>
Date:   Tue Nov 19 14:35:10 2019 -0700

    bug fix

commit 8805acd
Author: Man.Zhang <Man.Zhang@noaa.gov>
Date:   Tue Nov 19 14:16:22 2019 -0700

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

commit f8a257a
Author: Man.Zhang <Man.Zhang@noaa.gov>
Date:   Thu Nov 14 19:12:39 2019 -0700

    use upper-case CCPP

commit 77f4fba
Author: Man.Zhang <Man.Zhang@noaa.gov>
Date:   Thu Nov 14 13:40:59 2019 -0700

     implement FA scheme water loading option if nwat =4

commit 9871607
Merge: ed75004 786447c
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Nov 5 06:59:34 2019 +0900

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

commit ed75004
Merge: 1d6035a f627bfb
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
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 f627bfb
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Oct 7 12:12:24 2019 +0900

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

commit e868186
Author: Dusan Jovic <dusan.jovic@noaa.gov>
Date:   Tue Sep 24 01:57:11 2019 +0000

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

commit 672eb0e
Author: fanglin.yang <fanglin.yang@noaa.gov>
Date:   Thu Sep 5 19:24:09 2019 +0000

        VLab Issue #68141

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

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

commit 1d6035a
Merge: 94ab0e1 fec8205
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon Sep 23 09:32:55 2019 -0600

    Merge pull request #2 from climbfuji/remove_transition_mode

    Remove TRANSITION mode

commit fec8205
Author: climbfuji <dom.heinzeller@icloud.com>
Date:   Fri Sep 20 08:52:01 2019 -0600

    Remove TRANSITION mode

commit 94ab0e1
Author: Jun.Wang <Jun.Wang@noaa.gov>
Date:   Mon Aug 26 21:03:55 2019 +0000

    add option to output omega

commit b700cae
Author: climbfuji <dom.heinzeller@icloud.com>
Date:   Fri Aug 30 11:58:00 2019 -0600

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

commit 3df1171
Author: Laurie Carson <carson@ucar.edu>
Date:   Fri Aug 16 10:46:56 2019 -0600

    Add codeowners for NCAR fork
  • Loading branch information
@climbfuji
climbfuji committed Apr 14, 2020
1 parent 80ce8ce commit 34b4503
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions driver/fvGFS/atmosphere.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ module atmosphere_mod
! <tr>
! <td>mpp_mod</td>
! <td>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</td>
! </tr>
! <tr>
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions model/fv_regional_bc.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ' &
/)
!
!-----------------------------------------------------------------------
Expand Down

0 comments on commit 34b4503

Please sign in to comment.