Skip to content
Success

Changes

Summary

  1. Adding some new code that puts the diffusion term d(wp2*em)/dz into a new function, creates a new wp3 budget term (wp3_pr_dfsn), and adds that new budget term to pyplotgen. (details)
  2. Adding new coefficient to control the wp3 pressure diffusion term. (details)
  3. Some minor updates to advance_wp2_wp3 relevant to the pr_turb and pr_dfsn terms. (details)
  4. Converting em*d(em)/dz to d(em^2)/dz in the wp3_pr_turb term and fixing a typo. (details)
  5. Renaming C_wp3_turb --> C_wp3_pr_turb (BIT_CHANGING due to name change in netcdf output). (details)
  6. Resetting C_wp3_pr_dfsn constant to zero in two tunable_parameters.in files since it was set to 0.1 by mistake. (details)
  7. Pyplotgen update: (details)
  8. These changes add the new fourth-order moment variables wp2up2 and wp2vp2 to the CLUBB code. This requires a new function in pdf_closure_module since they must be calculated separately with a new formula, and they are fed through into advance_wp2_wp3 for use with the pr_dfsn subroutine. They are also added to the standard stats file and will be output to netcdf, hence this commit is BIT_CHANGING. (details)
  9. Renaming parameter C_wp3_turb-->C_wp3_pr_turb in the alternative tunable_parameters files. (details)
  10. Putting the wp3_pr_turb formulation back to its d(rho*wp2*em)/dz form.  This would be a BIT_CHANGING commit since it would change the answers for the pr_turb term. However once this branch is merged into the master branch, results should be bit-for-bit since this term was only modified in the alternate branch. (details)
  11. Pyplotgen updates: adding new wp3_pr_dfsn term to SAM style budgets. (details)
  12. Added intent comments for the following files: (details)
Commit 3523145a4f3c69d90f797ac315a808b0607df8af by 59519056+bstephens82
Adding some new code that puts the diffusion term d(wp2*em)/dz into a new function, creates a new wp3 budget term (wp3_pr_dfsn), and adds that new budget term to pyplotgen.
The file was modified input/stats/standard_stats.in (diff)
The file was modified src/CLUBB_core/stats_variables.F90 (diff)
The file was modified src/CLUBB_core/stats_zt_module.F90 (diff)
The file was modified src/CLUBB_core/advance_wp2_wp3_module.F90 (diff)
The file was modified postprocessing/pyplotgen/config/VariableGroupBaseBudgets.py (diff)
Commit d1363bca96e31f5a0b7d41079d395ff96c2f4e34 by 59519056+bstephens82
Adding new coefficient to control the wp3 pressure diffusion term.
The file was modified src/CLUBB_core/parameter_indices.F90 (diff)
The file was modified src/CLUBB_core/clubb_api_module.F90 (diff)
The file was modified input/tunable_parameters/tunable_parameters.in (diff)
The file was modified src/CLUBB_core/advance_wp2_wp3_module.F90 (diff)
The file was modified src/CLUBB_core/parameters_tunable.F90 (diff)
Commit ea19b31abbaec274e1b215720886306879bf5209 by 59519056+bstephens82
Some minor updates to advance_wp2_wp3 relevant to the pr_turb and pr_dfsn terms.
The file was modified src/CLUBB_core/advance_wp2_wp3_module.F90 (diff)
Commit 513df8d73c415cf3b4f24681e7ca304dd26323ed by 59519056+bstephens82
Converting em*d(em)/dz to d(em^2)/dz in the wp3_pr_turb term and fixing a typo.
The file was modified src/CLUBB_core/stats_clubb_utilities.F90 (diff)
The file was modified src/CLUBB_core/advance_wp2_wp3_module.F90 (diff)
Commit c5e4581bd53f4a9f561de1819263d426095583d5 by 59519056+bstephens82
Renaming C_wp3_turb --> C_wp3_pr_turb (BIT_CHANGING due to name change in netcdf output).

See #884.
The file was modified ens_tune/error_combined_001.in (diff)
The file was modified input/tunable_parameters_Lscale/tunable_parameters.in (diff)
The file was modified input_misc/tuner/error_dycoms2_rf02_ds.in (diff)
The file was modified input_misc/tuner/error_dycoms2_rf02_do.in (diff)
The file was modified src/CLUBB_core/advance_wp2_wp3_module.F90 (diff)
The file was modified src/CLUBB_core/clubb_api_module.F90 (diff)
The file was modified input_misc/tuner/error_atex.in (diff)
The file was modified input_misc/tuner/error_all.in (diff)
The file was modified input_misc/tuner/error_fire.in (diff)
The file was modified src/CLUBB_core/parameter_indices.F90 (diff)
The file was modified input_misc/tuner/error_arm.in (diff)
The file was modified input_misc/tuner/error_wangara.in (diff)
The file was modified input_misc/tuner/error_ticket_756.in (diff)
The file was modified input_misc/tuner/error_arm_97.in (diff)
The file was modified input_misc/tuner/error_gabls2.in (diff)
The file was modified input/tunable_parameters_compatible_r8029/tunable_parameters.in (diff)
The file was modified src/CLUBB_core/parameters_tunable.F90 (diff)
The file was modified input_misc/tuner/error_rico.in (diff)
The file was modified input_misc/tuner/error_dycoms2_rf01.in (diff)
The file was modified input/tunable_parameters_e3sm/tunable_parameters.in (diff)
The file was modified input_misc/tuner/error_dycoms2_rf02_nd.in (diff)
The file was modified input_misc/tuner/error_lba.in (diff)
The file was modified input_misc/tuner/error_gabls3_night.in (diff)
The file was modified input_misc/tuner/error_nov11_altocu.in (diff)
The file was modified input_misc/tuner/error_bomex.in (diff)
Commit 40e9f58f8a9918412ab5402cf593e2fd3663e171 by 59519056+bstephens82
Resetting C_wp3_pr_dfsn constant to zero in two tunable_parameters.in files since it was set to 0.1 by mistake.
The file was modified input/tunable_parameters_Lscale/tunable_parameters.in (diff)
The file was modified input/tunable_parameters_e3sm/tunable_parameters.in (diff)
Commit 59f21059cf78c77a1d223b5f87217806cd25f61a by 59519056+bstephens82
Pyplotgen update:

Adding wp3_pr_dfsn to the residual calculation in pyplotgen to get the residual line correct.
The file was modified postprocessing/pyplotgen/config/VariableGroupBaseBudgets.py (diff)
Commit 9a63bd645bd0dfedb18f7a3ab7d13c99d7883acc by 59519056+bstephens82
These changes add the new fourth-order moment variables wp2up2 and wp2vp2 to the CLUBB code. This requires a new function in pdf_closure_module since they must be calculated separately with a new formula, and they are fed through into advance_wp2_wp3 for use with the pr_dfsn subroutine. They are also added to the standard stats file and will be output to netcdf, hence this commit is BIT_CHANGING.

The new variables are also added to pyplotgen as part of VariableGroupWs.py where wp4 is found.

See #920.
The file was modified src/CLUBB_core/advance_wp2_wp3_module.F90 (diff)
The file was modified src/CLUBB_core/stats_clubb_utilities.F90 (diff)
The file was modified input/stats/standard_stats.in (diff)
The file was modified postprocessing/pyplotgen/config/VariableGroupWs.py (diff)
The file was modified src/CLUBB_core/stats_zm_module.F90 (diff)
The file was modified src/CLUBB_core/stats_variables.F90 (diff)
The file was modified src/CLUBB_core/advance_clubb_core_module.F90 (diff)
The file was modified input/tunable_parameters/tunable_parameters.in (diff)
The file was modified src/CLUBB_core/pdf_closure_module.F90 (diff)
Commit 6e1d9b030b0cffbfb07d8ef15555bcd8830a292d by 59519056+bstephens82
Renaming parameter C_wp3_turb-->C_wp3_pr_turb in the alternative tunable_parameters files.
The file was modified input/tunable_parameters_Lscale/tunable_parameters.in (diff)
The file was modified input/tunable_parameters_compatible_r8029/tunable_parameters.in (diff)
The file was modified input/tunable_parameters_e3sm/tunable_parameters.in (diff)
Commit 9864f9b0f22913646bbb36963a5742d370dbc477 by 59519056+bstephens82
Putting the wp3_pr_turb formulation back to its d(rho*wp2*em)/dz form.  This would be a BIT_CHANGING commit since it would change the answers for the pr_turb term. However once this branch is merged into the master branch, results should be bit-for-bit since this term was only modified in the alternate branch.

See #920.
The file was modified src/CLUBB_core/advance_wp2_wp3_module.F90 (diff)
Commit a922aca2d6add3f9a080aa4a542d793a8fe9b8dd by benjamin.andrew.stephens
Pyplotgen updates: adding new wp3_pr_dfsn term to SAM style budgets.

See #895 and #920.
The file was modified postprocessing/pyplotgen/config/VariableGroupBaseBudgetsSamStyle.py (diff)
Commit 103b65d48c57146ed63a900c901fa0f0f62aefb7 by rhodesk
Added intent comments for the following files:
advance_clubb_core_module, advance_helper_module, and advance_windm_edsclrm_module.
These changes are BFB.
For ticket #924.
The file was modified src/CLUBB_core/advance_clubb_core_module.F90 (diff)
The file was modified src/CLUBB_core/advance_helper_module.F90 (diff)
The file was modified src/CLUBB_core/advance_windm_edsclrm_module.F90 (diff)
The file was modified src/CLUBB_core/calc_pressure.F90 (diff)
The file was modified src/CLUBB_core/stats_type_utilities.F90 (diff)
The file was modified src/CLUBB_core/interpolation.F90 (diff)