Skip to content
Success

Changes

Summary

  1. Non trad coriolis (#1267) (details)
  2. Making changes needed for clubb's new non traditional coriolis update (#211) (details)
  3. Forgot to rename variables, and also setting fcor and fcor_y to nonzero. Which should be BFB thanks to the l_implemented flag. (details)
Commit 7a1bb756cf4c4937e3ed2f2f431666919e52834f by noreply
Non trad coriolis (#1267)

* Updating the clubb core and silhs version files

* Fixing bug. qclvar copying is handled by the api, but we were deleting it with an unstructured data statement. I added this due as a fix before thinking qclvar was a local variable, which happened because I mixed up the CLUBB_CAM and CLUBBND_CAM flags. https://github.com/larson-group/cam/issues/175

* Fixing GPU bug. There is a vertical dependency with wpxp. This is what was breaking the ECT test, see larson-group/cam#175

* Moving pdf_params copying to copyin. This is the data structure that contains pointers, and these pointers will be different on the host and device, so it is bad in theory to copy the structure back to the CPU as it might overwrite cpu memory pointers with gpu memory pointers. In practice though I've seen no problems caused by this, I'm just making this commit preemptively, and it has already been tested with the ECT test.

* Moving PosInf to clubb_model_settings.F90

* Updating the clubb core and silhs version files

* Add flags for the Coriolis terms.

* Pass fcory from api module into advance module

* Implement the traditional Coriolis terms

* Implement the nontraditional Coriolis terms

* Add stats variables for the Coriolis terms

* Compute Coriolis parameters from namelist latitude

* Create the coriolis_test case

* Tune the coriolis_test case. However, oscillation frequency is too slow

* Correct a coefficient in Coriolis. "coriolis_test" matches analytical

* Update advance_clubb_core_module.F90

Rename fcory as fcor_y and add description

* Update advance_wp2_wp3_module.F90

Rename fcory as fcor_y and add description

* Update advance_xm_wpxp_module.F90

Rename fcory as fcor_y and add description

* Update advance_xp2_xpyp_module.F90

Rename fcory as fcor_y and add description

* Update clubb_api_module.F90

Rename fcory as fcor_y and add description

* Update spurious_source_test.F90

Rename fcory as fcor_y and add description

* Update clubb_driver.F90

Rename fcor as fcor_y and add description.
Also, add description for the coriolis_test

* Update generalized_grid_test.F90

Rename fcory as fcor_y and add description.

* Update coriolis_test_model.in

Add description for the Coriolis test case

* Stablize the cgils_s6 case with smaller time step

* Create the ekman case

* Tune the ekman case to match LES

* Compute wp2up with PDF and pass along with wp2thvp

* Implement the nontraditional Coriolis term for wp3

* Fine-tune parameters for the ekman case

* Create the atex_long case

* Retune ekman case with l_vary_convect_depth = .true.

* Fine-tune the atex_long case

* Add atex_long case to pyplotgen

* Fine-tune atex_long case with less radical changes

* Updating the clubb core and silhs version files

* Small bug fix in the wp2up flip and adding new files to the cmakelist

* Renmaing, moving some files, and reverting change to cgils_s6 timestep

* Adding new flags to flag test file

* Updating comment for fcor_y calculation explanation

* Removing accidentally added file

---------

Co-authored-by: pickett <larsongroupgithub@gmail.com>
Co-authored-by: Hing Ong <hing.ong@anl.gov>
Co-authored-by: Hing Ong <36782452+HingOng@users.noreply.github.com>
The file was modifiedpdf_closure_module.F90 (diff)
The file was modifiedstats_clubb_utilities.F90 (diff)
The file was modifiedstats_zt_module.F90 (diff)
The file was modifiedadvance_clubb_core_module.F90 (diff)
The file was modifiedoutput_netcdf.F90 (diff)
The file was modifiedgrid_adaptation_module.F90 (diff)
The file was modifiednumerical_check.F90 (diff)
The file was modifiedmodel_flags.F90 (diff)
The file was modifiedclubb_api_module.F90 (diff)
The file was modifiedstats_zm_module.F90 (diff)
The file was modifiedadvance_wp2_wp3_module.F90 (diff)
The file was modifiedadvance_xm_wpxp_module.F90 (diff)
The file was modifiedadvance_xp2_xpyp_module.F90 (diff)
The file was modifiedstats_variables.F90 (diff)
The file was modifiedconstants_clubb.F90 (diff)
Commit e66e18d3220e298679e1c9ba43349068693d72b4 by noreply
Making changes needed for clubb's new non traditional coriolis update (#211)

* Making changes needed for clubb's new non traditional coriolis update

* Also adding namelist entries for new coriolis options

* Renaming fcorz to fcor_y
The file was modifiedbld/namelist_files/namelist_defaults_cam.xml (diff)
The file was modifiedbld/build-namelist (diff)
The file was modifiedsrc/physics/cam/clubb_intr.F90 (diff)
The file was modifiedbld/namelist_files/namelist_definition.xml (diff)
Commit 5e1b0fb6c44d8b1f12db713c058fefdd96b67606 by Gunther Huebler
Forgot to rename variables, and also setting fcor and fcor_y to nonzero. Which should be BFB thanks to the l_implemented flag.
The file was modifiedbld/build-namelist (diff)
The file was modifiedbld/namelist_files/namelist_defaults_cam.xml (diff)
The file was modifiedsrc/physics/cam/clubb_intr.F90 (diff)
The file was modifiedbld/namelist_files/namelist_definition.xml (diff)