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

Add capability for SCAM forcing based on gridded met fields. #595

Closed
wants to merge 32 commits into from
Closed

Add capability for SCAM forcing based on gridded met fields. #595

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e7c0a09
Want to start GW development from latest cam_development
Dec 2, 2021
0f219fd
Merge branch 'ESCOMP:cam_development' into cam_development
JulioTBacmeister May 10, 2022
14b65ee
Merge branch 'ESCOMP:cam_development' into cam_development
JulioTBacmeister May 20, 2022
7f43caa
Capability for SCAM to be driven by gridded met fields
May 20, 2022
496c209
Merge branch 'cam_development' of https://github.com/JulioTBacmeister…
May 20, 2022
bb4cca9
correcting dimensions of PKO,RV in get_ana_dynfrc_4scam.F90
May 24, 2022
d542611
moving mountain
May 26, 2022
103a3c5
trying to restore original intent
May 26, 2022
6be8815
buildnml mod to accomodate templtes with %
May 27, 2022
91dc7e4
must be necessary
May 27, 2022
6b98a09
missing )
May 27, 2022
31846dd
revert change to build-namelest
May 31, 2022
5c96d42
revert again
May 31, 2022
e51206f
Merge pull request #1 from peverwhee/scam_julio
JulioTBacmeister Jun 1, 2022
e7133bf
redo build-namelist
Jun 1, 2022
77aa2cc
updated make_basecase.auto.csh
Jun 7, 2022
2d1ded5
removed cime_config/usermods_dirs/scam_STUB/scripts/run_cases.csf
Jun 7, 2022
807811f
removed cime_config/usermods_dirs/scam_STUB/scripts/make_basecase.aut…
Jun 7, 2022
89fac35
Updated to new CLUBB external
Jul 14, 2022
5ca9af9
Python tools etc for SCAM
Jul 16, 2022
e5be7c3
forgot case_name
Jul 16, 2022
6560907
name change
Jul 18, 2022
35d50be
working on python, clubbtop
Jul 20, 2022
0b9fad0
Externals_CAM updated
Jul 20, 2022
33f1d5c
mflit etc
Jul 21, 2022
7fa25e0
adding some plotting
Jul 25, 2022
7660d98
adding support for cheyenne and L93
JulioTBacmeister Jul 26, 2022
fd648c6
typo/syntax and UBC for H2O
JulioTBacmeister Jul 26, 2022
b8ec3dc
Merge branch 'cam_development' of https://github.com/JulioTBacmeister…
Jul 26, 2022
8405550
added machine recognition, ie., izumi, cheyenne
Jul 27, 2022
3676dc7
more support for diff machines etc.
Jul 27, 2022
e9cdc1b
clean up
Jul 28, 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
12 changes: 6 additions & 6 deletions Externals_CAM.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ required = True

[clubb]
local_path = src/physics/clubb
protocol = git
repo_url = https://github.com/ESCOMP/CLUBB_CESM
tag = clubb_release_b76a124_20200220_c20200320
protocol = svn
repo_url = https://github.com/larson-group/clubb_release/tags/
tag = clubb_4ncar_20220311_f51de38/src/CLUBB_core
required = True

[silhs]
local_path = src/physics/silhs
protocol = git
repo_url = https://github.com/ESCOMP/SILHS_CESM
tag = silhs_clubb_release_b76a124_20200220_c20200320
protocol = svn
repo_url = https://github.com/larson-group/clubb_release/tags/
tag = clubb_4ncar_20220311_f51de38/src/SILHS
Comment on lines +24 to +33
Copy link
Collaborator

Choose a reason for hiding this comment

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

@JulioTBacmeister - Are these changes really needed for your SCAM PR? Hopefully you can use the tags that are currently being used in CAM instead

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I want to use the "new" CLUBB external brought in with cam6_3_059. This is so that we can assess prognostic momentum transport using SCAM.

required = True

[pumas]
Expand Down
120 changes: 92 additions & 28 deletions bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3080,55 +3080,112 @@ if ($clubb_sgs =~ /$TRUE/io) {
}

add_default($nl, 'clubb_do_icesuper');

add_default($nl, 'clubb_expldiff');
add_default($nl, 'clubb_rainevap_turb');
add_default($nl, 'clubb_do_energyfix');
add_default($nl, 'clubb_cloudtop_cooling');
add_default($nl, 'clubb_timestep');
add_default($nl, 'clubb_rainevap_turb');
add_default($nl, 'clubb_rnevap_effic');

add_default($nl, 'clubb_beta');
add_default($nl, 'clubb_c1');
add_default($nl, 'clubb_c1b');
add_default($nl, 'clubb_c11');
add_default($nl, 'clubb_c11b');
add_default($nl, 'clubb_c14');
add_default($nl, 'clubb_C2rt');
add_default($nl, 'clubb_C2thl');
add_default($nl, 'clubb_C2rtthl');
add_default($nl, 'clubb_C4');
add_default($nl, 'clubb_c6rt');
add_default($nl, 'clubb_c6rtb');
add_default($nl, 'clubb_c6rtc');
add_default($nl, 'clubb_c6thl');
add_default($nl, 'clubb_c6thlb');
add_default($nl, 'clubb_c6thlc');
add_default($nl, 'clubb_timestep');
add_default($nl, 'clubb_l_diag_Lscale_from_tau');

my $clubb_Lscale_from_tau = $nl->get_value('clubb_l_diag_Lscale_from_tau');

if($clubb_Lscale_from_tau =~ "true") {
add_default($nl, 'clubb_c1', 'val'=>1.0);
add_default($nl, 'clubb_c1b', 'val'=>1.0);
add_default($nl, 'clubb_C2rt', 'val'=>1.0);
add_default($nl, 'clubb_C2thl', 'val'=>1.0);
add_default($nl, 'clubb_C2rtthl', 'val'=>1.0);
add_default($nl, 'clubb_C4', 'val'=>5.2);
add_default($nl, 'clubb_C_uu_shr', 'val'=>0.1076484659222455);
add_default($nl, 'clubb_C_uu_buoy', 'val'=>0.3);
add_default($nl, 'clubb_c6rt', 'val'=>2.0);
add_default($nl, 'clubb_c6rtb', 'val'=>2.0);
add_default($nl, 'clubb_c6rtc', 'val'=>1.0);
add_default($nl, 'clubb_c6thl', 'val'=>2.0);
add_default($nl, 'clubb_c6thlb', 'val'=>2.0);
add_default($nl, 'clubb_c6thlc', 'val'=>1.0);
add_default($nl, 'clubb_C8', 'val'=>3.440377776099962);
add_default($nl, 'clubb_C8b', 'val'=>0.0);
add_default($nl, 'clubb_c11', 'val'=>0.31057411754034614);
add_default($nl, 'clubb_c11b', 'val'=>0.3250718127387944);
add_default($nl, 'clubb_c14', 'val'=>1.0);
add_default($nl, 'clubb_C_invrs_tau_bkgnd', 'val'=>3.727123755772682);
add_default($nl, 'clubb_C_invrs_tau_sfc', 'val'=>0.12743072568015346);
add_default($nl, 'clubb_C_invrs_tau_shear', 'val'=>0.12502726304767026);
add_default($nl, 'clubb_C_invrs_tau_N2', 'val'=>0.08122667220596895);
add_default($nl, 'clubb_C_invrs_tau_N2_wp2', 'val'=>0.1);
add_default($nl, 'clubb_C_invrs_tau_N2_xp2', 'val'=>0.05);
add_default($nl, 'clubb_C_invrs_tau_N2_wpxp', 'val'=>0.0);
add_default($nl, 'clubb_C_invrs_tau_N2_clear_wp3', 'val'=>1.0);
add_default($nl, 'clubb_gamma_coef', 'val'=>0.5492223674353673);
add_default($nl, 'clubb_gamma_coefb', 'val'=>0.2531868210746816);
add_default($nl, 'clubb_beta', 'val'=>2.27756371212011);
} else {
add_default($nl, 'clubb_c1');
add_default($nl, 'clubb_c1b');
add_default($nl, 'clubb_C2rt');
add_default($nl, 'clubb_C2thl');
add_default($nl, 'clubb_C2rtthl');
add_default($nl, 'clubb_C4');
add_default($nl, 'clubb_C_uu_shr');
add_default($nl, 'clubb_C_uu_buoy');
add_default($nl, 'clubb_c6rt');
add_default($nl, 'clubb_c6rtb');
add_default($nl, 'clubb_c6rtc');
add_default($nl, 'clubb_c6thl');
add_default($nl, 'clubb_c6thlb');
add_default($nl, 'clubb_c6thlc');
add_default($nl, 'clubb_C8');
add_default($nl, 'clubb_C8b');
add_default($nl, 'clubb_c11');
add_default($nl, 'clubb_c11b');
add_default($nl, 'clubb_c14');
add_default($nl, 'clubb_C_invrs_tau_bkgnd');
add_default($nl, 'clubb_C_invrs_tau_sfc');
add_default($nl, 'clubb_C_invrs_tau_shear');
add_default($nl, 'clubb_C_invrs_tau_N2');
add_default($nl, 'clubb_C_invrs_tau_N2_wp2');
add_default($nl, 'clubb_C_invrs_tau_N2_xp2');
add_default($nl, 'clubb_C_invrs_tau_N2_wpxp');
add_default($nl, 'clubb_C_invrs_tau_N2_clear_wp3');
add_default($nl, 'clubb_gamma_coef');
add_default($nl, 'clubb_gamma_coefb');
add_default($nl, 'clubb_beta');
}

add_default($nl, 'clubb_C7');
add_default($nl, 'clubb_C7b');
add_default($nl, 'clubb_C8');
add_default($nl, 'clubb_C8b');

add_default($nl, 'clubb_C_wp3_pr_turb');
add_default($nl, 'clubb_c_K1');
add_default($nl, 'clubb_c_K2');
add_default($nl, 'clubb_nu2');
add_default($nl, 'clubb_c_K8');
add_default($nl, 'clubb_c_K9');
add_default($nl, 'clubb_nu9');
add_default($nl, 'clubb_c_K10');
add_default($nl, 'clubb_c_K10h');
add_default($nl, 'clubb_do_liqsupersat');
add_default($nl, 'clubb_gamma_coef');
add_default($nl, 'clubb_gamma_coefb');
add_default($nl, 'clubb_wpxp_L_thresh');

add_default($nl, 'clubb_lambda0_stability_coef');
add_default($nl, 'clubb_lmin_coef');
add_default($nl, 'clubb_mult_coef');
add_default($nl, 'clubb_Skw_denom_coef');
add_default($nl, 'clubb_skw_max_mag');
add_default($nl, 'clubb_up2_vp2_factor');
add_default($nl, 'clubb_up2_sfc_coef');
add_default($nl, 'clubb_C_wp2_splat');
add_default($nl, 'clubb_wpxp_L_thresh');
add_default($nl, 'clubb_detliq_rad');
add_default($nl, 'clubb_detice_rad');
add_default($nl, 'clubb_detphase_lowtemp');
add_default($nl, 'clubb_ipdf_call_placement');

add_default($nl, 'clubb_l_brunt_vaisala_freq_moist');
add_default($nl, 'clubb_l_call_pdf_closure_twice');
add_default($nl, 'clubb_l_damp_wp3_Skw_squared');
add_default($nl, 'clubb_l_lmm_stepping');
add_default($nl, 'clubb_l_e3sm_config');
add_default($nl, 'clubb_l_lscale_plume_centered');
add_default($nl, 'clubb_l_min_wp2_from_corr_wx');
add_default($nl, 'clubb_l_min_xp2_from_corr_wx');
Expand All @@ -3141,11 +3198,18 @@ if ($clubb_sgs =~ /$TRUE/io) {
add_default($nl, 'clubb_l_use_C7_Richardson');
add_default($nl, 'clubb_l_use_C11_Richardson');
add_default($nl, 'clubb_l_use_cloud_cover');
add_default($nl, 'clubb_l_use_ice_latent');
add_default($nl, 'clubb_l_use_thvm_in_bv_freq');
add_default($nl, 'clubb_l_vert_avg_closure');
add_default($nl, 'clubb_l_diag_Lscale_from_tau');
add_default($nl, 'clubb_l_damp_wp2_using_em');
add_default($nl, 'clubb_l_godunov_upwind_wpxp_ta');
add_default($nl, 'clubb_l_godunov_upwind_xpyp_ta');
add_default($nl, 'clubb_l_use_shear_Richardson');
add_default($nl, 'clubb_l_use_tke_in_wp3_pr_turb_term');
add_default($nl, 'clubb_l_use_tke_in_wp2_wp3_K_dfsn');
add_default($nl, 'clubb_l_smooth_Heaviside_tau_wpxp');
add_default($nl, 'clubb_l_do_expldiff_rtm_thlm');

#CLUBB+MF options
add_default($nl, 'do_clubb_mf');
add_default($nl, 'do_clubb_mf_diag');
add_default($nl, 'clubb_mf_L0');
Expand Down
Loading