Skip to content
Failed

Changes

Summary

  1. Code changes to introduce wp2_pr_dfsn, the wp2 pressure diffusion term, consistent with Lumley 1978.  Related to #920. (details)
  2. Fixing comment for the wp2_term_pr_dfsn subroutine.  Related to #920. (details)
  3. Updating wp3 pressure diffusion term to be consistent with the Lumley 1978 formula for the perturbation pressure. For #920. (details)
  4. Making requested changes to the wp2 pressure diffuion additions, including correcting some grid-level related issues.  Related to #920. (details)
  5. Fixing some comments. (details)
  6. Correcting a typo bug and adding some descriptive comments to two new variables.  This is a BIT_CHANGING commit becuase it will affect the newly calculated variables and descriptions in the output files, but it won't affect any plotted results. Related to #920. (details)
  7. Feeding stats variables to needed subroutines (details)
  8. Fixing compiliation errors (details)
  9. Fixing compiliation errors (details)
  10. Reflecting changes to nightly tests clubb_intr (details)
  11. Removing updated clubb and silhs directories (details)
  12. Fixing incorrect coding standard (details)
  13. Moving the stats variables to module variables of clubb_driver. (details)
  14. Moving the stats variables to module variables of clubb_driver. (details)
  15. Fixing coding standard viloation of lines exceeding 100 characters. (details)
  16. Fixing coding standard viloation of lines exceeding 100 characters. (details)
  17. Adding wp3_pr_tp (aka "negative nose" term) to wp3 equation.  Related to #920. (details)
  18. Changing the way the new wp3_pr_tp term works, by generalizing the wp3_terp_pr_lhs subroutine.  Also cleaning up comments and changing the description of the wp3_pr_tp variable in the netcdf output files, hence this commit is BIT_CHANGING, although it will not affect numerical results since the wp3_pr_tp coefficient (C_wp3_pr_tp) is set to zero. (details)
  19. Removing l_interp_prescribed_params from setup_clubb_pdf_params. (details)
  20. Adding comments labeling subroutine calls with intent. (details)
  21. Adding intent labels for subroutines throughout clubb. (details)
  22. Removing unnecessary constant from use statement (details)
  23. Update the diagnostic. Put white boxes on global plot for all regions. Issue #36. (details)
  24. Eliminating l_nu_grid_dependent as requested. (details)
  25. Eliminating l_use_buoy_mod_Km_zm. (details)
  26. Eliminating l_iter_xp2_xpyp flag. (details)
  27. Eliminating l_apply_rule_to_pdf_params flag. (details)
  28. Eliminating l_ub_const_deriv flag. (details)
  29. Eliminating l_equation_21 flag. (details)
  30. Eliminating l_wp3_2nd_buoyancy flag. (details)
  31. Eliminating l_refine_grid_in_cloud and l_interactive_refined. (details)
  32. Eliminating l_use_experimental_term_pr2 and l_use_vert_avg_winds (details)
  33. Eliminating l_use_wp3_pr3 flag. (details)
  34. Eliminating l_clip_semi_implicit flag. (details)
  35. Adding intent labels for subroutines throughout clubb. (details)
  36. Commiting to test host models (details)
  37. Reverting changes to clubb and silhs (details)
Commit c7775211705fd48dec941135fc4a9fd44d2b98b9 by 59519056+bstephens82
Code changes to introduce wp2_pr_dfsn, the wp2 pressure diffusion term, consistent with Lumley 1978.  Related to #920.

This is BIT_CHANGING, but only because it will introduce some new output variables in the netcdf files.  It will not affect results currently since the pressure diffusion coefficient is set to zero.
The file was modified stats_variables.F90 (diff)
The file was modified pdf_closure_module.F90 (diff)
The file was modified advance_wp2_wp3_module.F90 (diff)
The file was modified parameter_indices.F90 (diff)
The file was modified stats_zm_module.F90 (diff)
The file was modified advance_clubb_core_module.F90 (diff)
The file was modified stats_clubb_utilities.F90 (diff)
The file was modified parameters_tunable.F90 (diff)
The file was modified stats_zt_module.F90 (diff)
Commit 9da282e948a7779026d75c8251148c3db0c86e08 by 59519056+bstephens82
Fixing comment for the wp2_term_pr_dfsn subroutine.  Related to #920.
The file was modified advance_wp2_wp3_module.F90 (diff)
Commit f6dcf5918b70b39693d2f4c2396ddf03fb6ef8c2 by 59519056+bstephens82
Updating wp3 pressure diffusion term to be consistent with the Lumley 1978 formula for the perturbation pressure. For #920.
The file was modified advance_wp2_wp3_module.F90 (diff)
Commit bdfc25a13cf9388a0cdba98fc9cfded02f0f4f74 by 59519056+bstephens82
Making requested changes to the wp2 pressure diffuion additions, including correcting some grid-level related issues.  Related to #920.
The file was modified advance_clubb_core_module.F90 (diff)
The file was modified advance_wp2_wp3_module.F90 (diff)
The file was modified advance_clubb_core_module.F90 (diff)
The file was modified stats_clubb_utilities.F90 (diff)
The file was modified advance_wp2_wp3_module.F90 (diff)
Commit 2a15f13230db5f5ca0dddbda5245b0dc67dd707a by benjamin.andrew.stephens
Correcting a typo bug and adding some descriptive comments to two new variables.  This is a BIT_CHANGING commit becuase it will affect the newly calculated variables and descriptions in the output files, but it won't affect any plotted results. Related to #920.
The file was modified pdf_closure_module.F90 (diff)
The file was modified stats_zt_module.F90 (diff)
Commit 56dd734bc405097dec3d397ef2039ceaa5d5688e by 72510114+RhodesKeegan
Feeding stats variables to needed subroutines
The file was modified components/cam/src/physics/silhs/silhs_api_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/clubb_api_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/new_hybrid_pdf_main.F90 (diff)
The file was modified components/cam/src/physics/silhs/latin_hypercube_driver_module.F90 (diff)
The file was modified components/cam/src/physics/cam/subcol_SILHS.F90 (diff)
The file was modified components/cam/src/physics/cam/clubb_intr.F90 (diff)
The file was modified components/cam/src/physics/clubb/stats_variables.F90 (diff)
The file was modified components/cam/src/physics/cam/clubb_intr.F90 (diff)
The file was modified components/cam/src/physics/cam/clubb_intr.F90 (diff)
Commit 233e7c5c8489250b21c205d624d515cc29c11adb by 72510114+RhodesKeegan
Reflecting changes to nightly tests clubb_intr
The file was modified nightly_test/clubb_intr.F90 (diff)
Commit fa52ac299ce3c9302a1831245ea9b837163ac2bb by 72510114+RhodesKeegan
Removing updated clubb and silhs directories
The file was modified components/cam/src/physics/clubb/new_hybrid_pdf_main.F90 (diff)
The file was modified components/cam/src/physics/silhs/silhs_api_module.F90 (diff)
The file was modified components/cam/src/physics/silhs/latin_hypercube_driver_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/clubb_api_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/stats_variables.F90 (diff)
Commit 381481560de2313069533eaef92c0c47e188a702 by 72510114+RhodesKeegan
Fixing incorrect coding standard
The file was modified components/cam/src/physics/cam/subcol_SILHS.F90 (diff)
Commit 3e33479b7b92dbd3b3195f0b18730302ae188bd0 by 72510114+RhodesKeegan
Moving the stats variables to module variables of clubb_driver.
This change means I had to modify clubb_api_module's arg list
along with other arg lists throughout clubb.
Everything compiles and results remain BFB identical.
For ticket #733.
The file was modified clubb_api_module.F90 (diff)
The file was modified stats_variables.F90 (diff)
Commit 29b6903d922283c188dba7426812537e02c8a5f8 by 72510114+RhodesKeegan
Moving the stats variables to module variables of clubb_driver.
This change means I had to modify clubb_api_module's arg list
along with other arg lists throughout clubb.
Everything compiles and results remain BFB identical.
For ticket #733.
The file was modified silhs_api_module.F90 (diff)
The file was modified latin_hypercube_driver_module.F90 (diff)
Commit e542998c8db09fe108f69821eef74868caba2c46 by rhodesk
Fixing coding standard viloation of lines exceeding 100 characters.
Violations were introduced as a result of changes made by ticket #733,
this commit resolves the coding standard violations.
Results BFB identical.
The file was modified advance_clubb_core_module.F90 (diff)
The file was modified advance_xp2_xpyp_module.F90 (diff)
The file was modified setup_clubb_pdf_params.F90 (diff)
Commit d5bdc8fbbb988928416a1fff23ec2592bb6142cd by rhodesk
Fixing coding standard viloation of lines exceeding 100 characters.
Violations were introduced as a result of changes made by ticket #733,
this commit resolves the coding standard violations.
Results BFB identical.
The file was modified silhs_api_module.F90 (diff)
Commit b1418c5d2b27c7560b6e18d9b05837722e7b13bb by 59519056+bstephens82
Adding wp3_pr_tp (aka "negative nose" term) to wp3 equation.  Related to #920.

This is not set up to change results currently, since the coefficient of the new term is zero, but it is BIT_CHANGING since it will include new output in the netcdf files.

Also includes updates to pyplotgen to accommodate the new term.
The file was modified stats_zt_module.F90 (diff)
The file was modified stats_variables.F90 (diff)
The file was modified advance_wp2_wp3_module.F90 (diff)
The file was modified parameter_indices.F90 (diff)
The file was modified parameters_tunable.F90 (diff)
Commit 3c12f9c674cc1a5d8e49b0f2c71ca8e2159fcc99 by 59519056+bstephens82
Changing the way the new wp3_pr_tp term works, by generalizing the wp3_terp_pr_lhs subroutine.  Also cleaning up comments and changing the description of the wp3_pr_tp variable in the netcdf output files, hence this commit is BIT_CHANGING, although it will not affect numerical results since the wp3_pr_tp coefficient (C_wp3_pr_tp) is set to zero.

Related to #920.
The file was modified stats_zt_module.F90 (diff)
The file was modified parameters_tunable.F90 (diff)
The file was modified advance_wp2_wp3_module.F90 (diff)
Commit d7fab3c6bdd5d928a2f6c377fe38514933d91cae by rhodesk
Removing l_interp_prescribed_params from setup_clubb_pdf_params.
The flag has been removed and so has any code underneat a logic statement
involving this statement unless it has multiple flags. The else statement
in the if block involving this flag has been set to execute without an
if block.
For ticket #916
Results are BFB identical. Additionally, complex logic statements
with the use of more flags had those flags adjusted and BFB results
were also confirmed with these changes.
The file was modified setup_clubb_pdf_params.F90 (diff)
Commit 3f4568e6d528cb591d7bbdd4b36faea5c65ab97d by rhodesk
Adding comments labeling subroutine calls with intent.
Goes all the way up until stats_clubb_utils.
BFB identical.
For ticket #942.
The file was modified clip_explicit.F90 (diff)
The file was modified output_grads.F90 (diff)
The file was modified fill_holes.F90 (diff)
The file was modified stats_rad_zt_module.F90 (diff)
The file was modified diagnose_correlations_module.F90 (diff)
The file was modified output_netcdf.F90 (diff)
The file was modified clip_semi_implicit.F90 (diff)
The file was modified setup_clubb_pdf_params.F90 (diff)
The file was modified pdf_closure_module.F90 (diff)
The file was modified input_reader.F90 (diff)
The file was modified stats_zm_module.F90 (diff)
The file was modified calendar.F90 (diff)
The file was modified mono_flux_limiter.F90 (diff)
The file was modified parameters_tunable.F90 (diff)
The file was modified advance_wp2_wp3_module.F90 (diff)
The file was modified corr_varnce_module.F90 (diff)
The file was modified advance_clubb_core_module.F90 (diff)
The file was modified sponge_layer_damping.F90 (diff)
The file was modified interpolation.F90 (diff)
The file was modified clubb_api_module.F90 (diff)
The file was modified code_timer_module.F90 (diff)
The file was modified stats_zt_module.F90 (diff)
The file was modified adg1_adg2_3d_luhar_pdf.F90 (diff)
The file was modified advance_xp2_xpyp_module.F90 (diff)
The file was modified stats_rad_zm_module.F90 (diff)
The file was modified grid_class.F90 (diff)
The file was modified numerical_check.F90 (diff)
The file was modified sfc_varnce_module.F90 (diff)
The file was modified stats_clubb_utilities.F90 (diff)
The file was modified file_functions.F90 (diff)
The file was modified pdf_parameter_module.F90 (diff)
The file was modified precipitation_fraction.F90 (diff)
The file was modified matrix_operations.F90 (diff)
The file was modified advance_xp3_module.F90 (diff)
The file was modified mixing_length.F90 (diff)
The file was modified mt95.f90 (diff)
Commit 8ae8997357c4cf9424fff53c57a41f07d0e589a5 by rhodesk
Adding intent labels for subroutines throughout clubb.
All calls to subroutines now have intent comments next to them
all the way up through stats_sfc_module.
Results are BFB identical.
For ticket #942.
The file was modified stats_clubb_utilities.F90 (diff)
The file was modified output_grads.F90 (diff)
The file was modified stats_lh_zt_module.F90 (diff)
The file was modified stats_type_utilities.F90 (diff)
The file was modified stats_lh_sfc_module.F90 (diff)
The file was modified output_netcdf.F90 (diff)
The file was modified stats_rad_zm_module.F90 (diff)
The file was modified stats_rad_zt_module.F90 (diff)
Commit de5061956ab80fe70758fae3535569ac2577ffca by noreply
Removing unnecessary constant from use statement
The file was modified advance_wp2_wp3_module.F90 (diff)
Commit 64c6ecec553bf58453380154a81f3849b262da5f by guozhun
Update the diagnostic. Put white boxes on global plot for all regions. Issue #36.
The file was modified diagnostic_v2_0/draw_plots_hoz_3D.py (diff)
The file was modified diagnostic_v2_0/function_cal_mean.py (diff)
The file was modified diagnostic_v2_0/draw_plots_hoz_2D.py (diff)
The file was modified diagnostic_v2_0/E3SM_CLUBB_diag.py (diff)
The file was modified diagnostic_v2_0/analyze_sensitivity_matrix.py (diff)
The file was modified diagnostic_v2_0/draw_large_scale.py (diff)
The file was modified diagnostic_v2_0/draw_clubb_budget.py (diff)
Commit 31547c8162b2ca222d55734a83f0275949b45b4d by rhodesk
Eliminating l_nu_grid_dependent as requested.
For ticket #926.
Results are BFB identical.
The file was modified parameters_tunable.F90 (diff)
Commit 6e5b373349a82f025de7446b87f5bfd28476e05c by rhodesk
Eliminating l_use_buoy_mod_Km_zm.
For ticket #926
if we use a buoyancy-modified expression for Km_zm.
Results are BFB identical.
The file was modified parameters_tunable.F90 (diff)
The file was modified advance_clubb_core_module.F90 (diff)
Commit c77d1e61d3b579d49e0fd2ccfe75479b65114174 by rhodesk
Eliminating l_iter_xp2_xpyp flag.
For ticket #926.
Results are BFB identical.
The file was modified advance_clubb_core_module.F90 (diff)
The file was modified advance_xp2_xpyp_module.F90 (diff)
Commit 76a87a65732f989e80d89d8cbf1755cc345985c7 by rhodesk
Eliminating l_apply_rule_to_pdf_params flag.
For ticket #926.
Results are BFB identical.
The file was modified advance_clubb_core_module.F90 (diff)
Commit 5d26a06857f44e9dacecd3a90398832306a35d44 by rhodesk
Eliminating l_ub_const_deriv flag.
For ticket #926.
Results are BFB identical.
The file was modified mean_adv.F90 (diff)
Commit 8eafa1e949712db4690b67cdc67ecb4e1aa0d0fc by rhodesk
Eliminating l_equation_21 flag.
For ticket #926.
Results are BFB identical
The file was modified interpolation.F90 (diff)
Commit 277403a3256e3d2bc78d7689c6cbf46db2779d38 by rhodesk
Eliminating l_wp3_2nd_buoyancy flag.
Code surrounding the flag is still present.
For ticket #926.
Results are BFB identical.
The file was modified advance_wp2_wp3_module.F90 (diff)
Commit 9072ea2f2525fae365156d81b3868c5fa7649e8a by rhodesk
Eliminating l_refine_grid_in_cloud and l_interactive_refined.
For ticket #926.
Results are BFB identical.
The file was modified advance_clubb_core_module.F90 (diff)
Commit bf0a2f0ffe74c69148a533e47f60db8ccf1fab4f by rhodesk
Eliminating l_use_experimental_term_pr2 and l_use_vert_avg_winds
For ticket #926
Results are BFB identical.
The file was modified advance_xp2_xpyp_module.F90 (diff)
The file was modified advance_clubb_core_module.F90 (diff)
Commit 96b8289cf47870ece5fb23fc50008a2919be7033 by rhodesk
Eliminating l_use_wp3_pr3 flag.
For ticket #926.
Results are BFB identical.
The file was modified advance_clubb_core_module.F90 (diff)
The file was modified model_flags.F90 (diff)
The file was modified advance_wp2_wp3_module.F90 (diff)
Commit 4bf75cca24dd38c8a3ce3d62332efe876b9ae9a0 by rhodesk
Eliminating l_clip_semi_implicit flag.
For ticket #926.
This commit is BIT_CHANGING due to how the flag needed to be removed.
More details on why this commit is bit changing can be seen on the ticket page.
The file was modified advance_wp2_wp3_module.F90 (diff)
The file was modified output_netcdf.F90 (diff)
The file was modified parameters_tunable.F90 (diff)
The file was modified model_flags.F90 (diff)
The file was modified advance_xm_wpxp_module.F90 (diff)
Commit c500b18f4ca3e29435b68642ab71147d1334683e by rhodesk
Adding intent labels for subroutines throughout clubb.
Remaining files now have intent comments for subroutines.
Additionally, all lines are now less than 100 characters.
For ticket #942.
Results are BFB identical.
The file was modified stats_type_utilities.F90 (diff)
The file was modified numerical_check.F90 (diff)
The file was modified advance_clubb_core_module.F90 (diff)
Commit adb0a20c5c54dfe7031121a3299214e349baab2e by 72510114+RhodesKeegan
Commiting to test host models
The file was modified components/cam/src/physics/clubb/stats_clubb_utilities.F90 (diff)
The file was modified components/cam/src/physics/clubb/clubb_api_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/model_flags.F90 (diff)
The file was modified components/cam/src/physics/clubb/output_netcdf.F90 (diff)
The file was modified components/cam/src/physics/clubb/parameter_indices.F90 (diff)
The file was modified components/cam/src/physics/silhs/output_2D_samples_module.F90 (diff)
The file was modified components/cam/src/physics/cam/subcol_SILHS.F90 (diff)
The file was modified components/cam/src/physics/clubb/advance_clubb_core_module.F90 (diff)
The file was modified components/cam/src/physics/cam/clubb_intr.F90 (diff)
The file was modified components/cam/src/physics/clubb/parameters_tunable.F90 (diff)
The file was modified components/cam/src/physics/silhs/latin_hypercube_driver_module.F90 (diff)
The file was modified components/cam/src/physics/silhs/silhs_api_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/advance_xp2_xpyp_module.F90 (diff)
Commit eb4cdd98a18cb717d699273363e808b85bf268e7 by 72510114+RhodesKeegan
Reverting changes to clubb and silhs
The file was modified components/cam/src/physics/clubb/stats_clubb_utilities.F90 (diff)
The file was modified components/cam/src/physics/clubb/advance_xp2_xpyp_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/parameters_tunable.F90 (diff)
The file was modified components/cam/src/physics/clubb/model_flags.F90 (diff)
The file was modified components/cam/src/physics/silhs/silhs_api_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/clubb_api_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/advance_clubb_core_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/output_netcdf.F90 (diff)
The file was modified components/cam/src/physics/silhs/output_2D_samples_module.F90 (diff)
The file was modified components/cam/src/physics/clubb/parameter_indices.F90 (diff)
The file was modified components/cam/src/physics/silhs/latin_hypercube_driver_module.F90 (diff)