Skip to content

MG2 update #6

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

Open
uramirez8707 wants to merge 13 commits into
base: main
Choose a base branch
from
Open

MG2 update #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c1aa687
add MG2 microphysics
Oct 29, 2020
7ecc59f
Fix rain_num2snow, rain_num_evap, rain_num_freez to avoid gFortran co…
Nov 23, 2020
b44474c
merge to 2021.02
Jun 22, 2021
8044a16
merge MG2_Xanadu202002 to 2021.02-alpha and fix the conflicts
Jun 22, 2021
1b2b143
fix qcsinksum_rate1ord
Jun 22, 2021
371ff33
add lon, lat for lscloud_driver for debug purpose
Jun 23, 2021
b837f30
clean up
Jun 24, 2021
993f160
update makefile.am
menzel-r Jun 25, 2021
1c41635
add some lines I forgot
menzel-r Jun 25, 2021
f0acbcb
Merge branch 'user/rlm/makefile-updates-for-huan' into 'user/h1g/MG2_…
Jun 25, 2021
234e657
Removes the total activation print statement and removes a #ifdef INT…
uramirez8707 Aug 5, 2021
ed52c0f
Merge branch 'user/u1r/MG2_2021.02_fix' into 'user/h1g/MG2_2021.02'
Aug 9, 2021
c2e8e21
Merge branch 'user/h1g/MG2_2021.02' of https://gitlab.gfdl.noaa.gov/f…
Aug 25, 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
16 changes: 15 additions & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ libatmos_phys_la_SOURCES = ${top_srcdir}/atmos_shared/atmos_nudge/atmos_nudge.F9
${top_srcdir}/atmos_param/microphysics/morrison_gettelman_microp.F90 \
${top_srcdir}/atmos_param/microphysics/gamma_mg.F90 \
${top_srcdir}/atmos_param/microphysics/micro_mg.F90 \
${top_srcdir}/atmos_param/microphysics/micro_mg2.F90 \
${top_srcdir}/atmos_param/microphysics/micro_mg2_utils.F90 \
${top_srcdir}/atmos_param/microphysics/rotstayn_klein_mp.F90 \
${top_srcdir}/atmos_param/microphysics/ls_cloud_microphysics.F90 \
${top_srcdir}/atmos_param/microphysics/simple_pdf.F90 \
Expand Down Expand Up @@ -783,6 +785,13 @@ ${top_builddir}/atmos_param/microphysics/micro_mg.lo: ${top_srcdir}/atmos_param/
${top_srcdir}/atmos_param/lscloud_driver/lscloud_types.lo \
${top_srcdir}/atmos_param/microphysics/simple_pdf.lo \
${top_srcdir}/atmos_param/physics_radiation_exch/physics_radiation_exch.lo
${top_builddir}/atmos_param/microphysics/micro_mg2.lo: ${top_srcdir}/atmos_param/microphysics/micro_mg2.F90 \
${top_srcdir}/atmos_param/microphysics/micro_mg2_utils.lo \
${top_srcdir}/atmos_param/microphysics/gamma_mg.lo \
${top_srcdir}/atmos_param/lscloud_driver/lscloud_types.lo \
${top_srcdir}/atmos_param/physics_radiation_exch/physics_radiation_exch.lo
${top_builddir}/atmos_param/microphysics/micro_mg2_utils.lo: ${top_srcdir}/atmos_param/microphysics/micro_mg2_utils.F90 \
${top_srcdir}/atmos_param/microphysics/gamma_mg.lo
${top_builddir}/atmos_param/microphysics/rotstayn_klein_mp.lo: ${top_srcdir}/atmos_param/microphysics/rotstayn_klein_mp.F90 \
${top_srcdir}/atmos_param/cloud_generator/cloud_generator.lo \
${top_srcdir}/atmos_shared/tracer_driver/aer_ccn_act/aer_in_act.lo \
Expand All @@ -801,7 +810,8 @@ ${top_builddir}/atmos_param/microphysics/ls_cloud_microphysics.lo: ${top_srcdir}
${top_srcdir}/atmos_param/microphysics/rotstayn_klein_mp.lo \
${top_srcdir}/atmos_param/microphysics/morrison_gettelman_microp.lo \
${top_srcdir}/atmos_param/microphysics/cldwat2m_micro.lo \
${top_srcdir}/atmos_param/microphysics/micro_mg.lo
${top_srcdir}/atmos_param/microphysics/micro_mg.lo \
${top_srcdir}/atmos_param/microphysics/micro_mg2.lo
${top_builddir}/atmos_param/microphysics/simple_pdf.lo: ${top_srcdir}/atmos_param/microphysics/simple_pdf.F90 \
${top_srcdir}/atmos_param/cloud_generator/betaDistribution.lo \
${top_srcdir}/atmos_param/lscloud_driver/lscloud_types.lo
Expand Down Expand Up @@ -1661,6 +1671,8 @@ morrison_gettelman_microp_mod.mod: ${top_srcdir}/atmos_param/microphysics/morris
gamma_mg_mod.mod: ${top_srcdir}/atmos_param/microphysics/gamma_mg.lo
micro_mg_mod.mod: ${top_srcdir}/atmos_param/microphysics/micro_mg.lo
micro_mg1_5.mod: ${top_srcdir}/atmos_param/microphysics/micro_mg.lo
micro_mg2_mod.mod: ${top_srcdir}/atmos_param/microphysics/micro_mg2.lo
micro_mg2_utils.mod: ${top_srcdir}/atmos_param/microphysics/micro_mg2_utils.lo
rotstayn_klein_mp_mod.mod: ${top_srcdir}/atmos_param/microphysics/rotstayn_klein_mp.lo
ls_cloud_microphysics_mod.mod: ${top_srcdir}/atmos_param/microphysics/ls_cloud_microphysics.lo
simple_pdf_mod.mod: ${top_srcdir}/atmos_param/microphysics/simple_pdf.lo
Expand Down Expand Up @@ -1973,6 +1985,8 @@ include_HEADERS = atmos_nudge_mod.mod \
gamma_mg_mod.mod \
micro_mg_mod.mod \
micro_mg1_5.mod \
micro_mg2_mod.mod \
micro_mg2_utils.mod \
rotstayn_klein_mp_mod.mod \
ls_cloud_microphysics_mod.mod \
simple_pdf_mod.mod \
Expand Down
237 changes: 184 additions & 53 deletions atmos_param/aerosol_cloud/aerosol_cloud.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading