Skip to content
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 dtc/develop from master 2020/06/06 #458

Merged
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
5ca808e
initialize HWRF sasas scheme using preprocessor directives controlled
mzhangw Dec 13, 2019
bff2547
add preprocessor directives for HWRF in samfshalcnv
mzhangw Dec 14, 2019
a4ac852
fix bugs to pass compilation
mzhangw Dec 18, 2019
beb3a33
delete HWRF ensemble capability
mzhangw Dec 18, 2019
c825f5f
remove if outside of loop per Doms suggestion
mzhangw Dec 20, 2019
029f448
bug fix
mzhangw Dec 26, 2019
178ce50
Merge branch 'man_hafs_sas_without_updates_of_dtc_develop_029f4489d4f…
climbfuji Apr 1, 2020
bccf301
physics/samfdeepcnv.f: bugfix, ca_deep only allocated when do_ca is .…
climbfuji Apr 1, 2020
71eace1
physics/samfshalcnv.f: bugfix, move assignment inside if block as in …
climbfuji Apr 3, 2020
b61ea19
physics/GFS_debug.F90: add capability to debug 1-d logical arrays
climbfuji Apr 6, 2020
5b5b663
Initializing ice fluxes by PBL calculated values when fluxes from CIC…
ShanSunNOAA Apr 8, 2020
c7c922f
Merge pull request #436 from climbfuji/update_master_from_dtc_develop…
climbfuji Apr 17, 2020
0472bef
add chsp changes from Jongil Han
junwang-noaa Apr 18, 2020
0e0c20e
fix ustar
junwang-noaa Apr 20, 2020
69d3298
fix syntax error in ccpp
junwang-noaa Apr 20, 2020
a66d980
Remove CCPP dynamic build from physics
climbfuji Apr 20, 2020
fc840f4
update sflx.f
junwang-noaa Apr 21, 2020
8c47bbf
Add missing code updates from IPD GFS_physics_driver.F90 to CCPP
climbfuji Apr 21, 2020
a757ef7
Merge pull request #2 from climbfuji/chsp_latlon_post_dom_ccpp_mods
junwang-noaa Apr 22, 2020
20d7e9d
Merge pull request #439 from climbfuji/remove_ccpp_dynamic_build
climbfuji Apr 23, 2020
a6e95db
Changing "_ocn"to "_wat" so the variable can be used for lake as well.
ShanSunNOAA Apr 23, 2020
424d7b6
Introducing tiice(:,;,2) as the 2-layer internal ice temperature
ShanSunNOAA Apr 24, 2020
8acb0a7
Merge remote-tracking branch 'upstream/master' into chsp_latlon_post
junwang-noaa Apr 24, 2020
f08797d
Introduce internal ice temperature. It is output only in the fracrtio…
ShanSunNOAA Apr 24, 2020
f57b5c3
add tsfcl change for CCPP
junwang-noaa Apr 24, 2020
366404d
fix synrax error
junwang-noaa Apr 25, 2020
f22b39c
Updating tiice in gcycle.F90
ShanSunNOAA Apr 26, 2020
4944892
Merge pull request #440 from junwang-noaa/chsp_latlon_post
climbfuji Apr 28, 2020
25a72ec
Ca develop (#418)
lisa-bengtsson May 4, 2020
379c2f3
scientific documentation update for UFS public release, add two addit…
mzhangw Feb 27, 2020
f48b283
add two new suites: GFSv15p2_no_nsst and GFSv16beta_no_nsst and GFS o…
mzhangw Mar 2, 2020
e63c34f
CCPP V4.0 scidoc update (#402)
mzhangw Mar 2, 2020
ab540e5
add no_nsst suites in all_schemes page per ligia email
mzhangw Mar 9, 2020
01a91cb
update ocean scheme description per Ligias request
mzhangw Mar 27, 2020
5a254ff
fix doxygen compile warnings
mzhangw Mar 27, 2020
e990919
fix m_micro prebuild error
mzhangw Mar 27, 2020
cec1ad9
fix doc of m_micro
mzhangw Mar 27, 2020
540035a
Update physics/docs/pdftxt/mainpage.txt
mzhangw Mar 30, 2020
7dea01c
minor fix
mzhangw Mar 30, 2020
c494cc7
Update version from 3.0.0 to 4.0.0
climbfuji May 6, 2020
5229075
Fix merge conflicts and apply missing updates for scientific document…
climbfuji May 6, 2020
6c1eec4
Remove dcyc2t3_post from physics/dcyc2.meta and scientific documentation
climbfuji May 6, 2020
e340e62
physics/m_micro.F90: correct syntax for \htmlinclude statement
climbfuji May 11, 2020
7b1e66c
Merge pull request #448 from climbfuji/bugfixes_from_public_release
climbfuji May 11, 2020
8f1169b
physics/gfdl_fv_sat_adj.F90: add compatibility check for six water sp…
climbfuji May 11, 2020
dd70b55
Add GitHub workflow for basic checks, add tool to check for ASCII enc…
climbfuji May 11, 2020
91a0dd9
Fix non-ascii encoding in a bunch of files (all comments)
climbfuji May 11, 2020
2fb92e8
Remove comments from .github/workflows/basic_checks.yml
climbfuji May 12, 2020
4f73869
Remove debug print statements from tools/check_encoding.py
climbfuji May 12, 2020
66376d5
Merge pull request #451 from climbfuji/travis-encoding-check_and_satu…
climbfuji May 12, 2020
9c6350f
Merge commit '5b5b663d2bd59942a711551f34e3c9c28c475909' into iceflx_t…
ShanSunNOAA May 20, 2020
df9053b
Merge commit 'f22b39c7dcfd582c9b610857a88942a4627e1d92' into iceflx_t…
ShanSunNOAA May 20, 2020
c2fbbbe
Adding tiice to RUC LSM.
ShanSunNOAA May 22, 2020
e913eed
Merge pull request #454 from shansun6/iceflx_ttice_20200520
climbfuji May 27, 2020
388999d
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into ma…
climbfuji Jun 3, 2020
ba106f7
fix unitialized parameters in samfdeepcnv
mzhangw Apr 30, 2020
42aa6e4
Bugfixes, and formatting changes in physics/samfdeepcnv.f
climbfuji Jun 3, 2020
4fcdf2f
Update of samfdeepcnv.f based on code review
climbfuji Jun 3, 2020
6a6dd2c
Merge pull request #423 from climbfuji/man_hafs_sas_for_master
climbfuji Jun 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix non-ascii encoding in a bunch of files (all comments)
climbfuji committed May 11, 2020
commit 91a0dd98b06c1acdb4d95fa74d7b7b3f939a26f4
4 changes: 2 additions & 2 deletions physics/cires_ugwp.F90
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@
!! "Unified": a) all GW effects due to both dissipation/breaking; b) identical GW solvers for all GW sources; c) ability to replace solvers.
!! Unified Formalism:
!! 1. GW Sources: Stochastic and physics based mechanisms for GW-excitations in the lower atmosphere, calibrated by the high-res analyses/forecasts, and observations (3 types of GW sources: orography, convection, fronts/jets).
!! 2. GW Propagation: Unified solver for propagation, dissipation and breaking excited from all type of GW sources.
!! 3. GW Effects: Unified representation of GW impacts on the resolved flow for all sources (energy-balanced schemes for momentum, heat and mixing).
!! 2. GW Propagation: Unified solver for "propagation, dissipation and breaking" excited from all type of GW sources.
!! 3. GW Effects: Unified representation of GW impacts on the "resolved" flow for all sources (energy-balanced schemes for momentum, heat and mixing).
!! https://www.weather.gov/media/sti/nggps/Presentations%202017/02%20NGGPS_VYUDIN_2017_.pdf

module cires_ugwp
8 changes: 4 additions & 4 deletions physics/drag_suite.F90
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ end subroutine drag_suite_init
!! the GWD scheme has the same physical basis as in Alpert (1987) with the addition
!! of enhancement factors for the amplitude, G, and mountain shape details
!! in G(Fr) to account for effects from the mountain blocking. A factor,
!! E m, is an enhancement factor on the stress in the Alpert '87 scheme.
!! E m', is an enhancement factor on the stress in the Alpert '87 scheme.
!! The E ranges from no enhancement to an upper limit of 3, E=E(OA)[1-3],
!! and is a function of OA, the Orographic Asymmetry defined in KA (1995) as
!!
@@ -105,9 +105,9 @@ end subroutine drag_suite_init
!!
!!
!! where Nx is the number of grid intervals for the large scale domain being
!! considered. So the term, E(OA)m/ \f$ \Delta X \f$ in Kim's scheme represents
!! a multiplier on G shown in Alpert's eq (1), where m is the number of mountains
!! in a sub-grid scale box. Kim increased the complexity of m making it a
!! considered. So the term, E(OA)m'/ \f$ \Delta X \f$ in Kim's scheme represents
!! a multiplier on G shown in Alpert's eq (1), where m' is the number of mountains
!! in a sub-grid scale box. Kim increased the complexity of m' making it a
!! function of the fractional area of the sub-grid mountain and the asymmetry
!! and convexity statistics which are found from running a gravity wave
!! model for a large number of cases:
8 changes: 4 additions & 4 deletions physics/gwdps.f
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ end subroutine gwdps_init
!! the GWD scheme has the same physical basis as in Alpert (1987) with the addition
!! of enhancement factors for the amplitude, G, and mountain shape details
!! in G(Fr) to account for effects from the mountain blocking. A factor,
!! E m, is an enhancement factor on the stress in the Alpert '87 scheme.
!! E m', is an enhancement factor on the stress in the Alpert '87 scheme.
!! The E ranges from no enhancement to an upper limit of 3, E=E(OA)[1-3],
!! and is a function of OA, the Orographic Asymmetry defined in Kim and Arakawa (1995)
!! \cite kim_and_arakawa_1995 as
@@ -103,9 +103,9 @@ end subroutine gwdps_init
!! \; (x_{j} \; - \; \bar{x} )^2}{N_{x}} }
!!\f]
!! where \f$N_{x}\f$ is the number of grid intervals for the large scale domain being
!! considered. So the term, E(OA)m/ \f$ \Delta X \f$ in Kim's scheme represents
!! a multiplier on G shown in Alpert's eq (1), where m is the number of mountains
!! in a sub-grid scale box. Kim increased the complexity of m making it a
!! considered. So the term, E(OA)m'/ \f$ \Delta X \f$ in Kim's scheme represents
!! a multiplier on G shown in Alpert's eq (1), where m' is the number of mountains
!! in a sub-grid scale box. Kim increased the complexity of m' making it a
!! function of the fractional area of the sub-grid mountain and the asymmetry
!! and convexity statistics which are found from running a gravity wave
!! model for a large number of cases:
2 changes: 1 addition & 1 deletion physics/micro_mg_utils.F90
Original file line number Diff line number Diff line change
@@ -2656,7 +2656,7 @@ end subroutine graupel_rime_splintering
! prdg(i) = epsg*(q(i)-qvi(i))/abi
!
!! make sure not pushed into ice supersat/subsat
!! put this in main mg3 code…..check for it
!! put this in main mg3 code ... check for it ...
!! formula from reisner 2 scheme

!!
2 changes: 1 addition & 1 deletion physics/samfdeepcnv.f
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ end subroutine samfdeepcnv_finalize
!! + 2) For the "dynamic control", using a reference cloud work function, estimate the change in cloud work function due to the large-scale dynamics. Following the quasi-equilibrium assumption, calculate the cloud base mass flux required to keep the large-scale convective destabilization in balance with the stabilization effect of the convection.
!! -# For grid sizes smaller than the threshold value (currently 8 km):
!! + 1) compute the cloud base mass flux using the cumulus updraft velocity averaged ove the whole cloud depth.
!! -# For scale awareness, the updraft fraction (sigma) is obtained as a function of cloud base entrainment. Then, the final cloud base mass flux is obtained by the original mass flux multiplied by the (1sigma) 2 .
!! -# For scale awareness, the updraft fraction (sigma) is obtained as a function of cloud base entrainment. Then, the final cloud base mass flux is obtained by the original mass flux multiplied by the (1-sigma) 2.
!! -# For the "feedback control", calculate updated values of the state variables by multiplying the cloud base mass flux and the tendencies calculated per unit cloud base mass flux from the static control.
!!
!! \section samfdeep_detailed GFS samfdeepcnv Detailed Algorithm
15 changes: 14 additions & 1 deletion physics/ugwp_driver_v0.F
Original file line number Diff line number Diff line change
@@ -264,7 +264,20 @@ end subroutine cires_ugwp_driver_v0
!=====================================================================
!>\ingroup cires_ugwp_run
!> @{
!!<b>Note for the sub-grid scale orography scheme in UGWP-v0:</b> Due to degraded forecast scores of simulations with revised schemes for subgrid-scale orography effects in FV3GFS, EMC reinstalled the original gwdps-code with updated efficiency factors for the mountain blocking and OGW drag. The GFS OGW is described in the separate section (\ref GFS_GWDPS) and its “call” moved into UGWP-driver subroutine. This combination of NGW and OGW schemes was tested in the FV3GFS-L127 medium-range forecasts (15-30 days) for C96, C192, C384 and C768 resolutions and work in progress to introduce the optimal choice for the scale-aware representations of the efficiency factors that will reflect the better simulations of GW activity by FV3 dynamical core at higher horizontal resolutions. With the MERRA-2 VMF function for NGWs (\ref slat_geos5_tamp) and operational OGW drag scheme (\ref GFS_GWDPS), FV3GFS simulations can successfully forecast the recent major mid-winter sudden stratospheric warming (SSW) events of 2018-02-12 and 2018-12-31 (10-14 days before the SSW onset; Yudin et al. 2019 \cite yudin_et_al_2019). The first multi-year (2015-2018) FV3GFS simulations with UGWP-v0 also produce the equatorial QBO-like oscillations in the zonal wind and temperature anomalies.
!! <b>Note for the sub-grid scale orography scheme in UGWP-v0:</b> Due to degraded forecast
!! scores of simulations with revised schemes for subgrid-scale orography effects in FV3GFS,
!! EMC reinstalled the original gwdps-code with updated efficiency factors for the mountain
!! blocking and OGW drag. The GFS OGW is described in the separate section (\ref GFS_GWDPS)
!! and its "call" moved into UGWP-driver subroutine. This combination of NGW and OGW schemes
!! was tested in the FV3GFS-L127 medium-range forecasts (15-30 days) for C96, C192, C384 and
!! C768 resolutions and work in progress to introduce the optimal choice for the scale-aware
!! representations of the efficiency factors that will reflect the better simulations of GW
!! activity by FV3 dynamical core at higher horizontal resolutions. With the MERRA-2 VMF
!! function for NGWs (\ref slat_geos5_tamp) and operational OGW drag scheme (\ref GFS_GWDPS),
!! FV3GFS simulations can successfully forecast the recent major mid-winter sudden stratospheric
!! warming (SSW) events of 2018-02-12 and 2018-12-31 (10-14 days before the SSW onset;
!! Yudin et al. 2019 \cite yudin_et_al_2019). The first multi-year (2015-2018) FV3GFS simulations
!! with UGWP-v0 also produce the equatorial QBO-like oscillations in the zonal wind and temperature anomalies.
!!
SUBROUTINE GWDPS_V0(IM, km, imx, do_tofd,
& Pdvdt, Pdudt, Pdtdt, Pkdis, U1,V1,T1,Q1,KPBL,