Skip to content

Add extended diagnostic output from Thompson MP, includes "Add optional scaling to RRTMGP flux adjustment" (#668), fix index bug in m_micro.F90 #679

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.

Sign up for GitHub

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

Merged
grantfirl merged 40 commits into from
Jul 9, 2021
Merged

Add extended diagnostic output from Thompson MP, includes "Add optional scaling to RRTMGP flux adjustment" (#668), fix index bug in m_micro.F90 #679

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
df30cf7
Limit full LW flux profile adjustment to below 100hPa.
dustinswales May 9, 2021
6961b10
Added more safeguards against out-of-bounds temperature to GP inputs.
dustinswales May 9, 2021
6ebe85e
Apply constant heating-rate adjustment above 100hPa
dustinswales May 11, 2021
230d479
Add vetical decay to impact of flux adjustment above threshold.
dustinswales May 11, 2021
5f7d697
Added logistic function to damp the LW flux adjustment with height
dustinswales May 24, 2021
e9bdebd
Add 3D diagnostics from thompson
ericaligo-NOAA May 24, 2021
2f6e708
Reorganized RRTMGP aerosol optics.
dustinswales May 24, 2021
3932db1
correction: add vts to additional calls and aux,naux to correct place…
ericaligo-NOAA May 25, 2021
7bc877d
Revert "Reorganized RRTMGP aerosol optics."
dustinswales May 25, 2021
36b6487
fix bug by adding a comma and add condensation/evap
ericaligo-NOAA May 25, 2021
eb7837d
Bug fix. Add transition to HR adjustment.
dustinswales May 25, 2021
c55797d
Optimize use of auxiliary arrays
climbfuji May 25, 2021
6a370fb
Merge pull request #1 from climbfuji/optimize_aux3d_thompson_dom
ericaligo-NOAA May 25, 2021
f2d5570
Removed exp(1) from scaling
dustinswales May 26, 2021
ea01139
Housekeeping. Added comments.
dustinswales May 26, 2021
d93adbe
Further cleanup of dcyc2
dustinswales May 26, 2021
fe44d62
Revert "Added more safeguards against out-of-bounds temperature to GP…
dustinswales May 26, 2021
6762adb
temperature tendency diagnostics added
ericaligo-NOAA May 27, 2021
6a0e904
Omission from previous revert.
dustinswales May 27, 2021
41782f1
Change from PR review.
dustinswales May 27, 2021
bed383f
additional thompson diagnostics coded up
ericaligo-NOAA May 28, 2021
094e7db
fix bug with some diagnostics
ericaligo-NOAA May 28, 2021
67c9e4b
Merge remote-tracking branch 'origin/master' into feature/diag
ericaligo-NOAA Jun 4, 2021
682a4e3
Merge sub cycling with my diagnostics
ericaligo-NOAA Jun 15, 2021
0e3bb76
Update Thompson extended diagnostics code
DomHeinzeller Jun 22, 2021
ed4a9de
Bugfixes for updated Thompson diagnostics code
climbfuji Jun 22, 2021
1f4a8eb
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into thom…
climbfuji Jun 22, 2021
4e39a44
Remove blank line at the top of physics/module_mp_thompson.F90
climbfuji Jun 22, 2021
2a61a8d
Fix bugs in diagnostics and dimension for aux3d array in meta file
ericaligo-NOAA Jun 23, 2021
96f17f5
Merge remote-tracking branch 'origin/master' into feature/diag
ericaligo-NOAA Jun 23, 2021
d83abd5
Merge branch 'feature/diag' of https://github.com/ericaligo-noaa/ccpp…
climbfuji Jun 23, 2021
1a0bf7b
Fix bug in physics/m_micro.F90: arrays on interfaces should start at 0
climbfuji Jun 23, 2021
7eba095
Add logic to reset extended diagnostics for Thompson MP based on rese…
climbfuji Jun 23, 2021
1c69f76
Use separate flag for resetting extended diagnostics for Thompson MP
climbfuji Jun 23, 2021
55398ea
Reenable commented-out code in physics/mp_thompson.F90
climbfuji Jun 23, 2021
8ddbb36
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into thom…
climbfuji Jul 1, 2021
28650fb
Remove old comment from physics/m_micro.F90, revert whitespace change…
climbfuji Jul 1, 2021
5c0ea2d
Comment out extended diagnostics vts1, txri, txrc
climbfuji Jul 2, 2021
3542434
Merge branch 'hotfix_AddPLimitToLWJacAdj' of https://github.com/dusti…
climbfuji Jul 2, 2021
f38d9a1
Yet another index-related bugfix in physics/m_micro.F90
climbfuji Jul 2, 2021
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
2 changes: 1 addition & 1 deletion physics/m_micro.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ subroutine m_micro_run( im, lm, flipv, dt_i &
real (kind=kind_phys), dimension(:,:),intent(in) :: &
& prsl_i,u_i,v_i,phil, omega_i, QLLS_i,QILS_i, &
& lwheat_i,swheat_i
real (kind=kind_phys), dimension(:,:),intent(in):: prsi_i, phii
real (kind=kind_phys), dimension(:,0:),intent(in):: prsi_i, phii
! GJF* These variables are conditionally allocated depending on whether the

@grantfirl grantfirl Jun 25, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment can be removed since this is now the default behavior for argument variables.

! Morrison-Gettelman microphysics is used, so they must be declared
! using assumed shape.
Expand Down
Loading