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

sync with the new community repository #47

Merged
merged 55 commits into from
Oct 26, 2022
Merged
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
2bd4acd
Coupling Merra2 aerosl climatology with Thompson microphysics
AnningCheng-NOAA Aug 23, 2021
dcfe289
merged the early version of merra nifa and nwfa
AnningCheng-NOAA Aug 24, 2021
f26d1fc
version worked for producing nifa and nwfa
AnningCheng-NOAA Aug 26, 2021
a975418
added merra2_aerosol_aware
AnningCheng-NOAA Aug 31, 2021
ab47e49
added mraerosol in typedef
AnningCheng-NOAA Sep 3, 2021
8427992
complete code for mraerosol
AnningCheng-NOAA Sep 17, 2021
8a9b8d1
mraerosol branch can pass control regression tests
AnningCheng-NOAA Oct 6, 2021
079eb2b
Minor bugfix in GFS_PBL_generic.F90, formatting changes in mp_thompso…
climbfuji Oct 6, 2021
5df6990
Merge branch 'mraerosol' of https://github.com/AnningCheng-NOAA/ccpp-…
climbfuji Oct 6, 2021
2ade7fe
Bug fixes and updates in module_mp_thompson.F90 and mp_thompson.F90
climbfuji Oct 6, 2021
1babf68
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into mrae…
climbfuji Oct 6, 2021
1aa28fb
Bug fixes for newly added code in module_mp_thompson.F90 and mp_thomp…
climbfuji Oct 6, 2021
95c67d3
Merge pull request #3 from climbfuji/mraerosol_dom
AnningCheng-NOAA Oct 7, 2021
88bcfd7
using field table instead of code change for mraerosol
AnningCheng-NOAA Oct 18, 2021
213d9f7
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into HEAD
climbfuji Oct 18, 2021
ddf9636
Merge remote-tracking branch 'upstream/main' into mraerosol
AnningCheng-NOAA Oct 18, 2021
74a6b6f
Updates and bug fixes for Thompson-Merra2
climbfuji Oct 18, 2021
32d9c3d
Merge branch 'mraerosol' of https://github.com/AnningCheng-NOAA/ccpp-…
climbfuji Oct 18, 2021
6d46c5f
Merge pull request #4 from climbfuji/anning_mraerosol_updates_dom_202…
AnningCheng-NOAA Oct 18, 2021
02f5178
decrease usage of mem 6 times less
AnningCheng-NOAA Nov 8, 2021
3a64072
synchronze mraerosol with trunk
AnningCheng-NOAA Mar 17, 2022
51e2968
Merge remote-tracking branch 'upstream/main' into mraerosol
AnningCheng-NOAA Mar 17, 2022
50faac8
some err fixed for compilation
AnningCheng-NOAA Mar 17, 2022
2d88c4d
synchronize with trunk and pass compilation
AnningCheng-NOAA Mar 21, 2022
7bbb6a5
mraerosl begins to run
AnningCheng-NOAA Apr 11, 2022
c2ac20e
increase max ice number, adjust cloud fraction generally lower
gthompsnWRF Apr 13, 2022
bd59240
adjust/tune for slightly lower reflectivities
gthompsnWRF Apr 20, 2022
c2062bb
permit more ice nucleation, adjust constant in zans (reflectivity) calc
gthompsnWRF Apr 20, 2022
ed0a53d
fix for length of lines
gthompsnWRF Apr 26, 2022
a5eae9f
trying to finalize constant in zans calculation
gthompsnWRF May 6, 2022
9272114
merge with trunk changes made for seperated post and pre
AnningCheng-NOAA May 9, 2022
4bf7263
merged with trunk passed compilation May 13
AnningCheng-NOAA May 13, 2022
06ac05f
update to top ccpp-physics
AnningCheng-NOAA Aug 24, 2022
4560e78
merged with trunk and pass compilation 8/25/2022
AnningCheng-NOAA Aug 25, 2022
14bf941
Merge branch 'small_cloud_tuning_GT' into small_cloud_tuning_GT_gjf
Sep 8, 2022
815438c
Merge branch 'main' into small_cloud_tuning_GT_gjf
Sep 9, 2022
8cfde78
move aero_ind_fdb variable in argument list for mp_gt_driver; add che…
Sep 9, 2022
e4b1da6
Merge remote-tracking branch 'anning/mraerosol1' into feature/merra2_…
ChunxiZhang-NOAA Sep 9, 2022
79a4f51
Merge remote-tracking branch 'upstream/main' into feature/merra2_thom…
ChunxiZhang-NOAA Sep 13, 2022
64a3409
Updated the Thompson scheme and fixed a bug in GSS_PBL_generic_common…
ChunxiZhang-NOAA Sep 16, 2022
ba43da2
module_sf_ruclsm imprecision workaround
SamuelTrahanNOAA Sep 21, 2022
e9611bd
Merge branch 'ufs/dev' into small_cloud_tuning_GT_gjf
Sep 22, 2022
fb66f0f
Renamed standard name flag_for_merra2_aerosol_aware_for_thompson and …
ChunxiZhang-NOAA Sep 23, 2022
824d40d
move sanity checks to lsm_ruc and add "snow on ice" check
SamuelTrahanNOAA Sep 26, 2022
d49e0d6
Slightly modify the Thompson scheme but it will not change the baseline
ChunxiZhang-NOAA Sep 28, 2022
9c1943c
Merge pull request #2 from ChunxiZhang-NOAA/feature/merra2_thompson
ChunxiZhang-NOAA Sep 30, 2022
15827c1
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into HEAD
Oct 6, 2022
04f4118
Merge branch 'ufs/dev' into small_cloud_tuning_GT_gjf
Oct 6, 2022
9009159
add additional documentation from Anning Cheng's MERRA2 implementatio…
Oct 6, 2022
cb0af04
Merge remote-tracking branch 'ufs/ufs/dev' into bugfix/rrfs-debug-mod…
SamuelTrahanNOAA Oct 10, 2022
cd2cae7
Merge pull request #13 from dustinswales/ncar-main-PR967
Oct 11, 2022
3f63679
Merge remote-tracking branch 'ufs/ufs/dev' into bugfix/rrfs-debug-mod…
SamuelTrahanNOAA Oct 11, 2022
353d0ff
Merge branch 'ufs/dev' into small_cloud_tuning_GT_gjf
Oct 14, 2022
ab220bf
Merge pull request #6 from SamuelTrahanNOAA/bugfix/rrfs-debug-mode-no…
grantfirl Oct 17, 2022
d93ce1a
Merge pull request #1 from grantfirl/small_cloud_tuning_GT_gjf
grantfirl Oct 18, 2022
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
decrease usage of mem 6 times less
AnningCheng-NOAA committed Nov 8, 2021
commit 02f51784ee9061f51fa94b3a230c150ba4c92ebb
18 changes: 9 additions & 9 deletions physics/GFS_phys_time_vary.fv3.F90
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ module GFS_phys_time_vary
use h2o_def, only : levh2o, h2o_coeff, h2o_lat, h2o_pres, h2o_time, h2oplin
use h2ointerp, only : read_h2odata, setindxh2o, h2ointerpol

use aerclm_def, only : aerin, aer_pres, ntrcaer, ntrcaerm
use aerclm_def, only : aerin, aer_pres, ntrcaer, ntrcaerm, iamin, iamax, jamin, jamax
use aerinterp, only : read_aerdata, setindxaer, aerinterpol, read_aerdataf

use iccn_def, only : ciplin, ccnin, ci_pres
@@ -68,7 +68,7 @@ module GFS_phys_time_vary
!! @{
subroutine GFS_phys_time_vary_init ( &
me, master, ntoz, h2o_phys, iaerclm, iccn, iflip, im, nx, ny, idate, xlat_d, xlon_d, &
jindx1_o3, jindx2_o3, ddy_o3, ozpl, jindx1_h, jindx2_h, ddy_h, h2opl, &
jindx1_o3, jindx2_o3, ddy_o3, ozpl, jindx1_h, jindx2_h, ddy_h, h2opl,fhour, &
jindx1_aer, jindx2_aer, ddy_aer, iindx1_aer, iindx2_aer, ddx_aer, aer_nm, &
jindx1_ci, jindx2_ci, ddy_ci, iindx1_ci, iindx2_ci, ddx_ci, imap, jmap, &
do_ugwp_v1, jindx1_tau, jindx2_tau, ddy_j1tau, ddy_j2tau, &
@@ -88,6 +88,7 @@ subroutine GFS_phys_time_vary_init (
integer, intent(in) :: me, master, ntoz, iccn, iflip, im, nx, ny
logical, intent(in) :: h2o_phys, iaerclm, flag_restart
integer, intent(in) :: idate(:)
real(kind_phys), intent(in) :: fhour
real(kind_phys), intent(in) :: xlat_d(:), xlon_d(:)

integer, intent(inout) :: jindx1_o3(:), jindx2_o3(:), jindx1_h(:), jindx2_h(:)
@@ -173,7 +174,7 @@ subroutine GFS_phys_time_vary_init (
integer, intent(out) :: errflg

! Local variables
integer :: i, j, ix, vegtyp, iamin, iamax, jamin, jamax
integer :: i, j, ix, vegtyp
real(kind_phys) :: rsnow

!--- Noah MP
@@ -387,8 +388,7 @@ subroutine GFS_phys_time_vary_init (
if (errflg/=0) return

if (iaerclm) then
call read_aerdataf (iamin, iamax, jamin, jamax, me, master, iflip, &
idate, errmsg, errflg)
call read_aerdataf (me, master, iflip, idate, fhour, errmsg, errflg)
if (errflg/=0) return
end if

@@ -715,7 +715,7 @@ end subroutine GFS_phys_time_vary_init
subroutine GFS_phys_time_vary_timestep_init ( &
me, master, cnx, cny, isc, jsc, nrcm, im, levs, kdt, idate, nsswr, fhswr, lsswr, fhour, &
imfdeepcnv, cal_pre, random_clds, nscyc, ntoz, h2o_phys, iaerclm, iccn, clstp, &
jindx1_o3, jindx2_o3, ddy_o3, ozpl, jindx1_h, jindx2_h, ddy_h, h2opl, &
jindx1_o3, jindx2_o3, ddy_o3, ozpl, jindx1_h, jindx2_h, ddy_h, h2opl, iflip, &
jindx1_aer, jindx2_aer, ddy_aer, iindx1_aer, iindx2_aer, ddx_aer, aer_nm, &
jindx1_ci, jindx2_ci, ddy_ci, iindx1_ci, iindx2_ci, ddx_ci, in_nm, ccn_nm, &
imap, jmap, prsl, seed0, rann, nthrds, nx, ny, nsst, tile_num, nlunit, lsoil, lsoil_lsm,&
@@ -730,7 +730,7 @@ subroutine GFS_phys_time_vary_timestep_init (

! Interface variables
integer, intent(in) :: me, master, cnx, cny, isc, jsc, nrcm, im, levs, kdt, &
nsswr, imfdeepcnv, iccn, nscyc, ntoz
nsswr, imfdeepcnv, iccn, nscyc, ntoz, iflip
integer, intent(in) :: idate(:)
real(kind_phys), intent(in) :: fhswr, fhour
logical, intent(in) :: lsswr, cal_pre, random_clds, h2o_phys, iaerclm
@@ -797,7 +797,7 @@ subroutine GFS_phys_time_vary_timestep_init (
!$OMP shared(ozpl,ddy_o3,h2o_phys,jindx1_h,jindx2_h,h2opl,ddy_h,iaerclm,master) &
!$OMP shared(levs,prsl,iccn,jindx1_ci,jindx2_ci,ddy_ci,iindx1_ci,iindx2_ci) &
!$OMP shared(ddx_ci,in_nm,ccn_nm,do_ugwp_v1,jindx1_tau,jindx2_tau,ddy_j1tau) &
!$OMP shared(ddy_j2tau,tau_amf) &
!$OMP shared(ddy_j2tau,tau_amf,iflip) &
!$OMP private(iseed,iskip,i,j,k)

!$OMP sections
@@ -889,7 +889,7 @@ subroutine GFS_phys_time_vary_timestep_init (
! aerinterpol is using threading inside, don't
! move into OpenMP parallel section above
call aerinterpol (me, master, nthrds, im, idate, &
fhour, jindx1_aer, jindx2_aer, &
fhour, iflip, jindx1_aer, jindx2_aer, &
ddy_aer, iindx1_aer, &
iindx2_aer, ddx_aer, &
levs, prsl, aer_nm)
17 changes: 17 additions & 0 deletions physics/GFS_phys_time_vary.fv3.meta
Original file line number Diff line number Diff line change
@@ -183,6 +183,15 @@
kind = kind_phys
intent = in
optional = F
[fhour]
standard_name = forecast_time
long_name = current forecast time
units = h
dimensions = ()
type = real
kind = kind_phys
intent = in
optional = F
[jindx1_aer]
standard_name = lower_latitude_index_of_aerosol_forcing_for_interpolation
long_name = interpolation low index for prescribed aerosols in the y direction
@@ -1301,6 +1310,14 @@
kind = kind_phys
intent = inout
optional = F
[iflip]
standard_name = control_for_vertical_index_direction
long_name = iflip - is not the same as flipv
units = flag
dimensions = ()
type = integer
intent = in
optional = F
[jindx1_aer]
standard_name = lower_latitude_index_of_aerosol_forcing_for_interpolation
long_name = interpolation low index for prescribed aerosols in the y direction
4 changes: 3 additions & 1 deletion physics/aerclm_def.F
Original file line number Diff line number Diff line change
@@ -2,8 +2,10 @@ module aerclm_def
use machine , only : kind_phys
implicit none

integer, parameter :: levsaer=72, ntrcaerm=15, timeaer=12
integer, parameter :: levsaer=72, ntrcaerm=15, timeaer=2
integer :: latsaer, lonsaer, ntrcaer, levsw
integer :: n1sv, n2sv
integer :: iamin, iamax, jamin, jamax

character*10 :: specname(ntrcaerm)
real (kind=kind_phys):: aer_time(13)
Loading