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.

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

Jump to bottom

Define new compsets for CLUBB, MAM4; fix link between CLUBB and polar mods #495

Merged
merged 1 commit into from
Nov 30, 2015
Merged

Define new compsets for CLUBB, MAM4; fix link between CLUBB and polar mods #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions cime/scripts/Tools/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ value of RUN_STARTDATE will be date2.
<COMPSET sname="F_AMIP_CAM5_CN" alias="FAMIPC5CN" >AMIP_CAM5_CLM40%CN_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
<COMPSET sname="F_1850-2000_CN" alias="F20TRCN" >20TR_CAM4_CLM40%CN_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
<COMPSET sname="F_2000_CAM5_CLUBB" alias="FC5CLUBB" >2000_CAM5%CLB_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
<COMPSET sname="F_2000_CAM5_MG2" alias="FC5MG2" >2000_CAM5%MG2_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
<COMPSET sname="F_2000_CAM5_CLBMG2" alias="FC5CLBMG2" >2000_CAM5%CLBMG2_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
<COMPSET sname="F_2000_CAM5_CLBMG2MAM4" alias="FC5CLBMG2MAM4" >2000_CAM5%CLBMG2MAM4_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
<COMPSET sname="F_1850_CAM5_PM" alias="F1850C5PM" >1850_CAM5%PM_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
<COMPSET sname="F_2000_CAM5_PM" alias="FC5PM" >2000_CAM5%PM_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
<COMPSET sname="F_1850_WACCM" alias="F1850W" >1850_CAM4%WCCM_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</COMPSET>
Expand Down Expand Up @@ -582,6 +585,9 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM
<CAM_CONFIG_OPTS compset="_CAM5%MAM4" >-chem trop_mam4</CAM_CONFIG_OPTS>
<CAM_CONFIG_OPTS compset="_CAM5%COSP" >-cosp</CAM_CONFIG_OPTS>
<CAM_CONFIG_OPTS compset="_CAM5%CLB" >-clubb_sgs</CAM_CONFIG_OPTS>
<CAM_CONFIG_OPTS compset="_CAM5%MG2" >-microphys mg2</CAM_CONFIG_OPTS>
<CAM_CONFIG_OPTS compset="_CAM5%CLBMG2" >-clubb_sgs -microphys mg2</CAM_CONFIG_OPTS>
<CAM_CONFIG_OPTS compset="_CAM5%CLBMG2MAM4" >-clubb_sgs -microphys mg2 -chem trop_mam4</CAM_CONFIG_OPTS>
<CAM_CONFIG_OPTS compset="_CAM5%UNI" >-unicon -cppdefs -DMODIFY_ACTIVATE</CAM_CONFIG_OPTS>
<CAM_CONFIG_OPTS compset="_CAM4%TBAM" >-chem trop_bam</CAM_CONFIG_OPTS>
<CAM_CONFIG_OPTS compset="_CAM4%TMOZ" >-chem trop_mozart</CAM_CONFIG_OPTS>
Expand Down Expand Up @@ -707,6 +713,9 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM
<desc compset="_CAM5%COSP" >CAM with COSP turned on:</desc>
<desc compset="_CAM5.*PLMOD" >CAM with all polar mods:</desc>
<desc compset="_CAM5%CLB" >CAM CLUBB:</desc>
<desc compset="_CAM5%MG2" >CAM MG2:</desc>
<desc compset="_CAM5%CLBMG2" >CAM CLUBB MG2:</desc>
<desc compset="_CAM5%CLBMG2MAM4" >CAM CLUBB MG2 MAM4:</desc>
<desc compset="_CAM5%PM" >CAM prescribed modal aerosols:</desc>
<desc compset="_CAM[45]%WCCM">CAM WACCM with daily solar data and SPEs:</desc>
<desc compset="_CAM[45]%WCMX">CAM WACCM-X:</desc>
Expand Down
4 changes: 4 additions & 0 deletions components/cam/src/physics/cam/physpkg.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2391,6 +2391,10 @@ subroutine tphysbc (ztodt, &
call modal_aero_wateruptake_dr(state, pbuf)
endif

if (do_clubb_sgs) then
sh_e_ed_ratio = 0.0_r8
endif

call aero_model_wetdep( ztodt, dlf, dlf2, cmfmc2, state, sh_e_ed_ratio, & !Intent-ins
mu, md, du, eu, ed, dp, dsubcld, jt, maxg, ideep, lengath, species_class,&
cam_out, & !Intent-inout
Expand Down