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

EAMxx: Change default value of lambda_high in SHOC to 0.08 #6797

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

EAMxx: Change default value of lambda_high in SHOC to 0.08 #6797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6463cb8
change default value of lambda_high in SHOC to 0.08
Dec 4, 2024
ad7df87
modify default lambda_high value in shoc tech doc file
Dec 5, 2024
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 components/eam/bld/namelist_files/namelist_defaults_eam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@
<shoc_length_fac > 0.5D0 </shoc_length_fac>
<shoc_c_diag_3rd_mom > 7.0D0 </shoc_c_diag_3rd_mom>
<shoc_lambda_low > 0.001D0 </shoc_lambda_low>
<shoc_lambda_high > 0.04D0 </shoc_lambda_high>
<shoc_lambda_high > 0.08D0 </shoc_lambda_high>
<shoc_lambda_slope > 2.65D0 </shoc_lambda_slope>
<shoc_lambda_thresh > 0.02D0 </shoc_lambda_thresh>
<shoc_Ckh > 0.1D0 </shoc_Ckh>
Expand Down
2 changes: 1 addition & 1 deletion components/eam/src/physics/cam/shoc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module shoc
real(rtype) :: length_fac = 0.5_rtype ! Length scale factor
real(rtype) :: c_diag_3rd_mom = 7.0_rtype ! w3 factor
real(rtype) :: lambda_low = 0.001_rtype ! lowest value for stability correction
real(rtype) :: lambda_high = 0.04_rtype ! highest value for stability correction
real(rtype) :: lambda_high = 0.08_rtype ! highest value for stability correction
real(rtype) :: lambda_slope = 2.65_rtype ! stability correction slope
real(rtype) :: lambda_thresh = 0.02_rtype ! value to apply stability correction
real(rtype) :: Ckh = 0.1_rtype ! Eddy diffusivity coefficient for heat
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/cime_config/namelist_defaults_scream.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ be lost if SCREAM_HACK_XML is not enabled.
<enable_column_conservation_checks>false</enable_column_conservation_checks>
<check_flux_state_consistency>false</check_flux_state_consistency>
<lambda_low type="real" doc="minimum value of stability correction.">0.001</lambda_low>
<lambda_high type="real" doc="maximum value of stability correction.">0.04</lambda_high>
<lambda_high type="real" doc="maximum value of stability correction.">0.08</lambda_high>
<lambda_slope type="real" doc="slope of change from lambda_low to lambda_high.">2.65</lambda_slope>
<lambda_thresh type="real" doc="stability threshold for which to apply more stability correction.">0.02</lambda_thresh>
<thl2tune type="real" doc="Temperature variance tuning factor">1.0</thl2tune>
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/docs/old/physics/shoc/shoc_doc.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ \subsubsection{Eddy Diffusivities}
\end{equation}
%

Where $\lambda_{min} = 0.001$, $\lambda_{slope}$ = 0.35, and $N_{low}$ = 0.037. Here, $\lambda_{slope}$ is an adjustable parameter. $\lambda_{0}$ has a minimum threshold of 0.001 and a maximum threshold of 0.04.
Where $\lambda_{min} = 0.001$, $\lambda_{slope}$ = 0.35, and $N_{low}$ = 0.037. Here, $\lambda_{slope}$ is an adjustable parameter. $\lambda_{0}$ has a minimum threshold of 0.001 and a maximum threshold of 0.08.

\paragraph{Stable Boundary Layer}

Expand Down
4 changes: 2 additions & 2 deletions components/eamxx/src/physics/shoc/tests/infra/shoc_test_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2140,7 +2140,7 @@ void isotropic_ts_host(Int nlev, Int shcol, Real* brunt_int, Real* tke,

// Hard code these runtime options for F90
const Real lambda_low = 0.001;
const Real lambda_high = 0.04;
const Real lambda_high = 0.08;
const Real lambda_slope = 2.65;
const Real lambda_thresh = 0.02;
SHF::isotropic_ts(team, nlev, lambda_low, lambda_high, lambda_slope, lambda_thresh,
Expand Down Expand Up @@ -2950,7 +2950,7 @@ void shoc_tke_host(Int shcol, Int nlev, Int nlevi, Real dtime, Real* wthv_sec, R

// Hardcode for F90 testing
const Real lambda_low = 0.001;
const Real lambda_high = 0.04;
const Real lambda_high = 0.08;
const Real lambda_slope = 2.65;
const Real lambda_thresh = 0.02;
const Real Ckh = 0.1;
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ atmosphere_processes:
shoc:
enable_column_conservation_checks: true
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...onents/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ atmosphere_processes:
max_total_ni: 740.0e3
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...onents/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ atmosphere_processes:
shoc:
check_flux_state_consistency: true
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...xx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_128levels/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ atmosphere_processes:
max_total_ni: 740.0e3
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ atmosphere_processes:
shoc:
check_flux_state_consistency: true
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...ss/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ atmosphere_processes:
shoc:
enable_column_conservation_checks: true
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...x/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ atmosphere_processes:
shoc:
enable_column_conservation_checks: true
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...s/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ atmosphere_processes:
shoc:
check_flux_state_consistency: true
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/dynamics_physics/model_restart/input_baseline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ atmosphere_processes:
max_total_ni: 740.0e3
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/dynamics_physics/model_restart/input_initial.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ atmosphere_processes:
do_prescribed_ccn: false
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/dynamics_physics/model_restart/input_restarted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ atmosphere_processes:
do_prescribed_ccn: false
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/atm_proc_subcycling/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ atmosphere_processes:
max_total_ni: 740.0e3
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ atmosphere_processes:
do_prescribed_ccn: false
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...sts/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_mam4_optics_rrtmgp/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ atmosphere_processes:
do_prescribed_ccn: false
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...nts/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_mam4_aci_p3_rrtmgp/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ atmosphere_processes:
do_prescribed_ccn: false
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/mam/shoc_cldfrac_p3_wetscav/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ atmosphere_processes:
do_prescribed_ccn: false
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_aci/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ atmosphere_processes:
top_level_mam4xx: 6
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_drydep/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ atmosphere_processes:
number_of_subcycles: ${MAC_MIC_SUBCYCLES}
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/shoc_cld_p3_rrtmgp/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ atmosphere_processes:
do_prescribed_ccn: false
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/shoc_cld_spa_p3_rrtmgp/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ atmosphere_processes:
max_total_ni: 740.0e3
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ atmosphere_processes:
source_pressure_file: vertical_remap.nc ## Only used in the case of STATIC_1D_VERTICAL_PROFILE
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion ...nts/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_nudging_glob_novert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ atmosphere_processes:
source_pressure_file: vertical_remap.nc ## Only used in the case of STATIC_1D_VERTICAL_PROFILE
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/multi-process/physics_only/shoc_p3_nudging/input_source_data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ atmosphere_processes:
max_total_ni: 720.0e3
shoc:
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/tests/single-process/shoc/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ atmosphere_processes:
number_of_subcycles: ${NUM_SUBCYCLES}
compute_tendencies: [all]
lambda_low: 0.001
lambda_high: 0.04
lambda_high: 0.08
lambda_slope: 2.65
lambda_thresh: 0.02
thl2tune: 1.0
Expand Down
Loading