-
Notifications
You must be signed in to change notification settings - Fork 368
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.
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
Implement CLUBB and MG2 #328
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… core from cam5_3_83. This branch is named CLUBBe to reflect that the updated clubb improves ENSO simulations in coupled mode. The modified ZM scheme with trigger-memory and the RRM capability have also been merged into this branch. modified: models/atm/cam/bld/build-namelist modified: models/atm/cam/bld/config_files/definition.xml modified: models/atm/cam/bld/config_files/horiz_grid.xml modified: models/atm/cam/bld/configure modified: models/atm/cam/bld/namelist_files/namelist_defaults_cam.xml modified: models/atm/cam/bld/namelist_files/namelist_definition.xml modified: models/atm/cam/src/control/runtime_opts.F90 modified: models/atm/cam/src/dynamics/eul/inidat.F90 modified: models/atm/cam/src/dynamics/fv/inidat.F90 modified: models/atm/cam/src/dynamics/se/inidat.F90 modified: models/atm/cam/src/dynamics/se/share/namelist_mod.F90 modified: models/atm/cam/src/dynamics/se/share/prim_driver_mod.F90 new file: models/atm/cam/src/physics/cam/cldfrc2m.F90 modified: models/atm/cam/src/physics/cam/cldwat2m_macro.F90 modified: models/atm/cam/src/physics/cam/clubb_intr.F90 modified: models/atm/cam/src/physics/cam/convect_deep.F90 modified: models/atm/cam/src/physics/cam/convect_shallow.F90 new file: models/atm/cam/src/physics/cam/dynamic_vector_procdef.inc new file: models/atm/cam/src/physics/cam/dynamic_vector_typedef.inc new file: models/atm/cam/src/physics/cam/hetfrz_classnuc.F90 new file: models/atm/cam/src/physics/cam/hetfrz_classnuc_cam.F90 modified: models/atm/cam/src/physics/cam/macrop_driver.F90 modified: models/atm/cam/src/physics/cam/micro_mg1_0.F90 modified: models/atm/cam/src/physics/cam/micro_mg1_5.F90 new file: models/atm/cam/src/physics/cam/micro_mg2_0.F90 modified: models/atm/cam/src/physics/cam/micro_mg_cam.F90 new file: models/atm/cam/src/physics/cam/micro_mg_data.F90 modified: models/atm/cam/src/physics/cam/micro_mg_utils.F90 modified: models/atm/cam/src/physics/cam/microp_aero.F90 modified: models/atm/cam/src/physics/cam/microp_driver.F90 modified: models/atm/cam/src/physics/cam/ndrop.F90 modified: models/atm/cam/src/physics/cam/nucleate_ice.F90 new file: models/atm/cam/src/physics/cam/nucleate_ice_cam.F90 new file: models/atm/cam/src/physics/cam/nudging.F90 modified: models/atm/cam/src/physics/cam/phys_control.F90 modified: models/atm/cam/src/physics/cam/physics_types.F90 modified: models/atm/cam/src/physics/cam/physpkg.F90 modified: models/atm/cam/src/physics/cam/rad_constituents.F90 modified: models/atm/cam/src/physics/cam/zm_conv.F90 modified: models/atm/cam/src/physics/cam/zm_conv_intr.F90 modified: models/atm/cam/src/physics/clubb/ChangeLog new file: models/atm/cam/src/physics/clubb/Nc_Ncn_eqns.F90 modified: models/atm/cam/src/physics/clubb/Skw_module.F90 modified: models/atm/cam/src/physics/clubb/T_in_K_module.F90 new file: models/atm/cam/src/physics/clubb/advance_clubb_core_module.F90 modified: models/atm/cam/src/physics/clubb/advance_helper_module.F90 modified: models/atm/cam/src/physics/clubb/advance_windm_edsclrm_module.F90 modified: models/atm/cam/src/physics/clubb/advance_wp2_wp3_module.F90 modified: models/atm/cam/src/physics/clubb/advance_xm_wpxp_module.F90 modified: models/atm/cam/src/physics/clubb/advance_xp2_xpyp_module.F90 modified: models/atm/cam/src/physics/clubb/anl_erf.F90 modified: models/atm/cam/src/physics/clubb/array_index.F90 modified: models/atm/cam/src/physics/clubb/calendar.F90 modified: models/atm/cam/src/physics/clubb/clip_explicit.F90 modified: models/atm/cam/src/physics/clubb/clip_semi_implicit.F90 new file: models/atm/cam/src/physics/clubb/clubb_api_module.F90 deleted: models/atm/cam/src/physics/clubb/clubb_core.F90 modified: models/atm/cam/src/physics/clubb/clubb_precision.F90 modified: models/atm/cam/src/physics/clubb/constants_clubb.F90 new file: models/atm/cam/src/physics/clubb/corr_varnce_module.F90 renamed: models/atm/cam/src/physics/clubb/csr_matrix_class_3array.F90 -> models/atm/cam/src/physics/clubb/csr_matrix_module.F90 new file: models/atm/cam/src/physics/clubb/diagnose_correlations_module.F90 modified: models/atm/cam/src/physics/clubb/diffusion.F90 modified: models/atm/cam/src/physics/clubb/endian.F90 modified: models/atm/cam/src/physics/clubb/error_code.F90 deleted: models/atm/cam/src/physics/clubb/extrapolation.F90 modified: models/atm/cam/src/physics/clubb/fill_holes.F90 modified: models/atm/cam/src/physics/clubb/gmres_cache.F90 modified: models/atm/cam/src/physics/clubb/gmres_wrap.F90 modified: models/atm/cam/src/physics/clubb/grid_class.F90 new file: models/atm/cam/src/physics/clubb/hydromet_pdf_parameter_module.F90 deleted: models/atm/cam/src/physics/clubb/hydrostatic_module.F90 deleted: models/atm/cam/src/physics/clubb/hyper_diffusion_4th_ord.F90 new file: models/atm/cam/src/physics/clubb/index_mapping.F90 modified: models/atm/cam/src/physics/clubb/input_names.F90 modified: models/atm/cam/src/physics/clubb/input_reader.F90 modified: models/atm/cam/src/physics/clubb/interpolation.F90 modified: models/atm/cam/src/physics/clubb/lapack_wrap.F90 new file: models/atm/cam/src/physics/clubb/matrix_operations.F90 modified: models/atm/cam/src/physics/clubb/mean_adv.F90 modified: models/atm/cam/src/physics/clubb/mixing_length.F90 modified: models/atm/cam/src/physics/clubb/model_flags.F90 modified: models/atm/cam/src/physics/clubb/mono_flux_limiter.F90 modified: models/atm/cam/src/physics/clubb/mt95.f90 modified: models/atm/cam/src/physics/clubb/numerical_check.F90 modified: models/atm/cam/src/physics/clubb/output_grads.F90 modified: models/atm/cam/src/physics/clubb/output_netcdf.F90 modified: models/atm/cam/src/physics/clubb/parameter_indices.F90 deleted: models/atm/cam/src/physics/clubb/parameters_microphys.F90 modified: models/atm/cam/src/physics/clubb/parameters_model.F90 deleted: models/atm/cam/src/physics/clubb/parameters_radiation.F90 modified: models/atm/cam/src/physics/clubb/parameters_tunable.F90 modified: models/atm/cam/src/physics/clubb/pdf_closure_module.F90 modified: models/atm/cam/src/physics/clubb/pdf_parameter_module.F90 new file: models/atm/cam/src/physics/clubb/pdf_utilities.F90 modified: models/atm/cam/src/physics/clubb/pos_definite_module.F90 modified: models/atm/cam/src/physics/clubb/recl.inc modified: models/atm/cam/src/physics/clubb/saturation.F90 new file: models/atm/cam/src/physics/clubb/setup_clubb_pdf_params.F90 modified: models/atm/cam/src/physics/clubb/sigma_sqd_w_module.F90 modified: models/atm/cam/src/physics/clubb/sponge_layer_damping.F90 modified: models/atm/cam/src/physics/clubb/stat_file_module.F90 new file: models/atm/cam/src/physics/clubb/stats_clubb_utilities.F90 new file: models/atm/cam/src/physics/clubb/stats_lh_sfc_module.F90 new file: models/atm/cam/src/physics/clubb/stats_lh_zt_module.F90 deleted: models/atm/cam/src/physics/clubb/stats_rad_zm.F90 new file: models/atm/cam/src/physics/clubb/stats_rad_zm_module.F90 deleted: models/atm/cam/src/physics/clubb/stats_rad_zt.F90 new file: models/atm/cam/src/physics/clubb/stats_rad_zt_module.F90 deleted: models/atm/cam/src/physics/clubb/stats_sfc.F90 new file: models/atm/cam/src/physics/clubb/stats_sfc_module.F90 deleted: models/atm/cam/src/physics/clubb/stats_subs.F90 modified: models/atm/cam/src/physics/clubb/stats_type.F90 renamed: models/atm/cam/src/physics/clubb/stats_type.F90 -> models/atm/cam/src/physics/clubb/stats_type_utilities.F90 modified: models/atm/cam/src/physics/clubb/stats_variables.F90 deleted: models/atm/cam/src/physics/clubb/stats_zm.F90 new file: models/atm/cam/src/physics/clubb/stats_zm_module.F90 deleted: models/atm/cam/src/physics/clubb/stats_zt.F90 new file: models/atm/cam/src/physics/clubb/stats_zt_module.F90 modified: models/atm/cam/src/physics/clubb/surface_varnce_module.F90 modified: models/atm/cam/src/physics/clubb/variables_diagnostic_module.F90 modified: models/atm/cam/src/physics/clubb/variables_prognostic_module.F90 deleted: models/atm/cam/src/physics/clubb/variables_radiation_module.F90 modified: models/csm_share/shr/shr_log_mod.F90 new file: models/csm_share/shr/shr_strconvert_mod.F90 modified: models/drv/driver/seq_domain_mct.F90 modified: models/lnd/clm/bld/namelist_files/namelist_defaults_clm4_0.xml modified: models/lnd/clm/bld/namelist_files/namelist_definition_clm4_0.xml modified: scripts/ccsm_utils/Case.template/config_compsets.xml modified: scripts/ccsm_utils/Case.template/config_grid.xml
CLUBBe and MG2 implementations introduce changes that have non-BFB effect when default physics is used. This update adds CPP macros based switches to allow for BFB to be maintained. The following macros are introduced. CLUBB_BFB_S1 for bugfix CLUBB_BFB_S2 for changes introduced in the CLUBBe implementation. CLUBB_BFB_ALL as an alternative to define both CLUBB_BFB_S1 and CLUBB_BFB_S2 To have BFB results with default physics, "-DCLUBB_BFB_S1 -DCLUBB_BFB_S2" or "-DCLUBB_BFB_ALL" should be added to CPPDEFS or FFLAGS in $CASE/Macros before running $CASE.build. Depending on needs, the flags can be selectively defined. modified: models/atm/cam/src/physics/cam/micro_mg1_0.F90 modified: models/atm/cam/src/physics/cam/micro_mg_utils.F90 modified: models/atm/cam/src/physics/cam/ndrop.F90
Reset CPP macros based switches to make BFB the default when updates via CLUBBe branch are used without turning on CLUBB or MG2. This should make the process simpler to pass acme developer and integration test suites. modified: models/atm/cam/src/physics/cam/micro_mg1_0.F90 modified: models/atm/cam/src/physics/cam/micro_mg_utils.F90 modified: models/atm/cam/src/physics/cam/ndrop.F90
Model in clubb mode is not able to run on mira. A temporary workaround fix is introduced to compile advance_clubb_core_module.F90 with two additional flags intended for debugging. This fix is applied through Depends.mira and Depends.cetus, respectively.
yjinho
added a commit
that referenced
this pull request
Oct 25, 2015
Merge branch 'origin/wlin/atm/clubbe' into next (PR #328) This merge brings CLUBBe (a final version of CLUBB) including MG2, ZM_trigger_modification, lots of modifications in ICE nucleation. Br default CLUBB is turned off. CLUBBe branch was a very old without CIME. Based on suggestions by Doug Jacobsen, I did the following > git config merge.renamelimit 6000 > git checkout next > git merge origin/wlin/atm/clubbe 1. Resolve conflicts based on the intermediate branch 'origin/yjinho/atm/clubbe2next_int1'. 2. Add many new files entire ./clubb/ directory cldfrc2m.F90 hetfrz_classnuc.F90 hetfrz_classnuc_cam.F90 micro_mg2_0.F90 micro_mg_data.F90 nucleate_ice_cam.F90 3. remove ./models 4. INTEL compile with full debug option passed. 5. Energy fixer from Po-Lun/Andrew is added. [BFB] AG-379 Conflicts: cime/machines-acme/Depends.cetus cime/scripts/Tools/config_grid.xml components/cam/bld/configure components/cam/bld/namelist_files/namelist_defaults_cam.xml components/cam/bld/namelist_files/namelist_definition.xml components/cam/src/physics/cam/convect_deep.F90 components/cam/src/physics/cam/convect_shallow.F90 components/cam/src/physics/cam/macrop_driver.F90 components/cam/src/physics/cam/micro_mg_cam.F90 components/cam/src/physics/cam/microp_aero.F90 components/cam/src/physics/cam/ndrop.F90 components/cam/src/physics/cam/nucleate_ice.F90 components/cam/src/physics/cam/phys_control.F90 components/cam/src/physics/cam/physpkg.F90 components/cam/src/physics/cam/zm_conv_intr.F90 components/cam/src/physics/clubb/clubb_core.F90 components/cam/src/physics/clubb/csr_matrix_class_3array.F90 components/cam/src/physics/clubb/extrapolation.F90 components/cam/src/physics/clubb/hydrostatic_module.F90 components/cam/src/physics/clubb/hyper_diffusion_4th_ord.F90 components/cam/src/physics/clubb/parameters_microphys.F90 components/cam/src/physics/clubb/parameters_radiation.F90 components/cam/src/physics/clubb/stats_rad_zm.F90 components/cam/src/physics/clubb/stats_rad_zt.F90 components/cam/src/physics/clubb/stats_sfc.F90 components/cam/src/physics/clubb/stats_subs.F90 components/cam/src/physics/clubb/stats_zm.F90 components/cam/src/physics/clubb/stats_zt.F90 components/cam/src/physics/clubb/variables_radiation_module.F90 components/clm/bld/namelist_files/namelist_defaults_clm4_0.xml components/homme/src/share/namelist_mod.F90 components/homme/src/share/prim_driver_mod.F90 models/atm/cam/src/physics/clubb/csr_matrix_class_3array.F90 models/atm/cam/src/physics/clubb/csr_matrix_module.F90
yjinho
added a commit
that referenced
this pull request
Oct 27, 2015
Merge branch 'origin/wlin/atm/clubbe' into master (PR #328) This merge brings CLUBBe (a final version of CLUBB) including MG2, ZM_trigger_modification, lots of modifications in ICE nucleation. By default CLUBB is turned off. CLUBBe branch was a very old without CIME. Based on suggestions by Doug Jacobsen, I did the following > git config merge.renamelimit 6000 > git checkout master > git merge origin/wlin/atm/clubbe 1. Resolve conflicts based on the intermediate branch 'origin/yjinho/atm/clubbe2next_int1' 2. Add many new files entire ./clubb/ directory cldfrc2m.F90 hetfrz_classnuc.F90 hetfrz_classnuc_cam.F90 micro_mg2_0.F90 micro_mg_data.F90 nucleate_ice_cam.F90 3. remove ./models 4. INTEL compile with full debug option passed. ACEM_developer test passed on edison (Some failed but consistently without merge). 5. Energy fixer from Po-Lun/Andrew is added. [BFB] AG-379 Conflicts: cime/machines-acme/Depends.cetus cime/scripts/Tools/config_grid.xml components/cam/bld/configure components/cam/bld/namelist_files/namelist_defaults_cam.xml components/cam/bld/namelist_files/namelist_definition.xml components/cam/src/dynamics/se/share/namelist_mod.F90 components/cam/src/dynamics/se/share/prim_driver_mod.F90 components/cam/src/physics/cam/convect_deep.F90 components/cam/src/physics/cam/convect_shallow.F90 components/cam/src/physics/cam/macrop_driver.F90 components/cam/src/physics/cam/micro_mg_cam.F90 components/cam/src/physics/cam/microp_aero.F90 components/cam/src/physics/cam/ndrop.F90 components/cam/src/physics/cam/nucleate_ice.F90 components/cam/src/physics/cam/phys_control.F90 components/cam/src/physics/cam/physpkg.F90 components/cam/src/physics/cam/zm_conv_intr.F90 components/cam/src/physics/clubb/clubb_core.F90 components/cam/src/physics/clubb/csr_matrix_class_3array.F90 components/cam/src/physics/clubb/extrapolation.F90 components/cam/src/physics/clubb/hydrostatic_module.F90 components/cam/src/physics/clubb/hyper_diffusion_4th_ord.F90 components/cam/src/physics/clubb/parameters_microphys.F90 components/cam/src/physics/clubb/parameters_radiation.F90 components/cam/src/physics/clubb/stats_rad_zm.F90 components/cam/src/physics/clubb/stats_rad_zt.F90 components/cam/src/physics/clubb/stats_sfc.F90 components/cam/src/physics/clubb/stats_subs.F90 components/cam/src/physics/clubb/stats_zm.F90 components/cam/src/physics/clubb/stats_zt.F90 components/cam/src/physics/clubb/variables_radiation_module.F90 components/clm/bld/namelist_files/namelist_defaults_clm4_0.xml models/atm/cam/src/physics/clubb/csr_matrix_class_3array.F90 models/atm/cam/src/physics/clubb/csr_matrix_module.F90
FULL ALERT! |
yjinho
added a commit
that referenced
this pull request
Oct 28, 2015
A main cause is 'Depends.cetus'. It is fixed. [BFB] AG-379
yjinho
added a commit
that referenced
this pull request
Oct 28, 2015
I made sure all the modified files are the same in next and master. Test is skipped. [BFB] AG-379
singhbalwinder
added a commit
that referenced
this pull request
Oct 28, 2015
This is to fix 'next' during CLUBBe branch merge. A main cause is 'Depends.cetus'. It is fixed. This should go only to next. This commit will ONLY be merged to next and NOT to master [BFB]
How was this branch tested before merging? |
jgfouca
pushed a commit
that referenced
this pull request
Feb 27, 2018
Merge branch 'origin/wlin/atm/clubbe' into master (PR #328) This merge brings CLUBBe (a final version of CLUBB) including MG2, ZM_trigger_modification, lots of modifications in ICE nucleation. By default CLUBB is turned off. CLUBBe branch was a very old without CIME. Based on suggestions by Doug Jacobsen, I did the following > git config merge.renamelimit 6000 > git checkout master > git merge origin/wlin/atm/clubbe 1. Resolve conflicts based on the intermediate branch 'origin/yjinho/atm/clubbe2next_int1' 2. Add many new files entire ./clubb/ directory cldfrc2m.F90 hetfrz_classnuc.F90 hetfrz_classnuc_cam.F90 micro_mg2_0.F90 micro_mg_data.F90 nucleate_ice_cam.F90 3. remove ./models 4. INTEL compile with full debug option passed. ACEM_developer test passed on edison (Some failed but consistently without merge). 5. Energy fixer from Po-Lun/Andrew is added. [BFB] AG-379 Conflicts: cime/machines-acme/Depends.cetus cime/scripts/Tools/config_grid.xml components/cam/bld/configure components/cam/bld/namelist_files/namelist_defaults_cam.xml components/cam/bld/namelist_files/namelist_definition.xml components/cam/src/dynamics/se/share/namelist_mod.F90 components/cam/src/dynamics/se/share/prim_driver_mod.F90 components/cam/src/physics/cam/convect_deep.F90 components/cam/src/physics/cam/convect_shallow.F90 components/cam/src/physics/cam/macrop_driver.F90 components/cam/src/physics/cam/micro_mg_cam.F90 components/cam/src/physics/cam/microp_aero.F90 components/cam/src/physics/cam/ndrop.F90 components/cam/src/physics/cam/nucleate_ice.F90 components/cam/src/physics/cam/phys_control.F90 components/cam/src/physics/cam/physpkg.F90 components/cam/src/physics/cam/zm_conv_intr.F90 components/cam/src/physics/clubb/clubb_core.F90 components/cam/src/physics/clubb/csr_matrix_class_3array.F90 components/cam/src/physics/clubb/extrapolation.F90 components/cam/src/physics/clubb/hydrostatic_module.F90 components/cam/src/physics/clubb/hyper_diffusion_4th_ord.F90 components/cam/src/physics/clubb/parameters_microphys.F90 components/cam/src/physics/clubb/parameters_radiation.F90 components/cam/src/physics/clubb/stats_rad_zm.F90 components/cam/src/physics/clubb/stats_rad_zt.F90 components/cam/src/physics/clubb/stats_sfc.F90 components/cam/src/physics/clubb/stats_subs.F90 components/cam/src/physics/clubb/stats_zm.F90 components/cam/src/physics/clubb/stats_zt.F90 components/cam/src/physics/clubb/variables_radiation_module.F90 components/clm/bld/namelist_files/namelist_defaults_clm4_0.xml models/atm/cam/src/physics/clubb/csr_matrix_class_3array.F90 models/atm/cam/src/physics/clubb/csr_matrix_module.F90
rljacob
pushed a commit
that referenced
this pull request
May 6, 2021
Merge branch 'origin/wlin/atm/clubbe' into master (PR #328) This merge brings CLUBBe (a final version of CLUBB) including MG2, ZM_trigger_modification, lots of modifications in ICE nucleation. By default CLUBB is turned off. CLUBBe branch was a very old without CIME. Based on suggestions by Doug Jacobsen, I did the following > git config merge.renamelimit 6000 > git checkout master > git merge origin/wlin/atm/clubbe 1. Resolve conflicts based on the intermediate branch 'origin/yjinho/atm/clubbe2next_int1' 2. Add many new files entire ./clubb/ directory cldfrc2m.F90 hetfrz_classnuc.F90 hetfrz_classnuc_cam.F90 micro_mg2_0.F90 micro_mg_data.F90 nucleate_ice_cam.F90 3. remove ./models 4. INTEL compile with full debug option passed. ACEM_developer test passed on edison (Some failed but consistently without merge). 5. Energy fixer from Po-Lun/Andrew is added. [BFB] AG-379 Conflicts: cime/machines-acme/Depends.cetus cime/scripts/Tools/config_grid.xml components/cam/bld/configure components/cam/bld/namelist_files/namelist_defaults_cam.xml components/cam/bld/namelist_files/namelist_definition.xml components/cam/src/dynamics/se/share/namelist_mod.F90 components/cam/src/dynamics/se/share/prim_driver_mod.F90 components/cam/src/physics/cam/convect_deep.F90 components/cam/src/physics/cam/convect_shallow.F90 components/cam/src/physics/cam/macrop_driver.F90 components/cam/src/physics/cam/micro_mg_cam.F90 components/cam/src/physics/cam/microp_aero.F90 components/cam/src/physics/cam/ndrop.F90 components/cam/src/physics/cam/nucleate_ice.F90 components/cam/src/physics/cam/phys_control.F90 components/cam/src/physics/cam/physpkg.F90 components/cam/src/physics/cam/zm_conv_intr.F90 components/cam/src/physics/clubb/clubb_core.F90 components/cam/src/physics/clubb/csr_matrix_class_3array.F90 components/cam/src/physics/clubb/extrapolation.F90 components/cam/src/physics/clubb/hydrostatic_module.F90 components/cam/src/physics/clubb/hyper_diffusion_4th_ord.F90 components/cam/src/physics/clubb/parameters_microphys.F90 components/cam/src/physics/clubb/parameters_radiation.F90 components/cam/src/physics/clubb/stats_rad_zm.F90 components/cam/src/physics/clubb/stats_rad_zt.F90 components/cam/src/physics/clubb/stats_sfc.F90 components/cam/src/physics/clubb/stats_subs.F90 components/cam/src/physics/clubb/stats_zm.F90 components/cam/src/physics/clubb/stats_zt.F90 components/cam/src/physics/clubb/variables_radiation_module.F90 components/clm/bld/namelist_files/namelist_defaults_clm4_0.xml models/atm/cam/src/physics/clubb/csr_matrix_class_3array.F90 models/atm/cam/src/physics/clubb/csr_matrix_module.F90
rljacob
pushed a commit
that referenced
this pull request
May 6, 2021
Merge branch 'origin/wlin/atm/clubbe' into master (PR #328) This merge brings CLUBBe (a final version of CLUBB) including MG2, ZM_trigger_modification, lots of modifications in ICE nucleation. By default CLUBB is turned off. CLUBBe branch was a very old without CIME. Based on suggestions by Doug Jacobsen, I did the following > git config merge.renamelimit 6000 > git checkout master > git merge origin/wlin/atm/clubbe 1. Resolve conflicts based on the intermediate branch 'origin/yjinho/atm/clubbe2next_int1' 2. Add many new files entire ./clubb/ directory cldfrc2m.F90 hetfrz_classnuc.F90 hetfrz_classnuc_cam.F90 micro_mg2_0.F90 micro_mg_data.F90 nucleate_ice_cam.F90 3. remove ./models 4. INTEL compile with full debug option passed. ACEM_developer test passed on edison (Some failed but consistently without merge). 5. Energy fixer from Po-Lun/Andrew is added. [BFB] AG-379 Conflicts: cime/machines-acme/Depends.cetus cime/scripts/Tools/config_grid.xml components/cam/bld/configure components/cam/bld/namelist_files/namelist_defaults_cam.xml components/cam/bld/namelist_files/namelist_definition.xml components/cam/src/dynamics/se/share/namelist_mod.F90 components/cam/src/dynamics/se/share/prim_driver_mod.F90 components/cam/src/physics/cam/convect_deep.F90 components/cam/src/physics/cam/convect_shallow.F90 components/cam/src/physics/cam/macrop_driver.F90 components/cam/src/physics/cam/micro_mg_cam.F90 components/cam/src/physics/cam/microp_aero.F90 components/cam/src/physics/cam/ndrop.F90 components/cam/src/physics/cam/nucleate_ice.F90 components/cam/src/physics/cam/phys_control.F90 components/cam/src/physics/cam/physpkg.F90 components/cam/src/physics/cam/zm_conv_intr.F90 components/cam/src/physics/clubb/clubb_core.F90 components/cam/src/physics/clubb/csr_matrix_class_3array.F90 components/cam/src/physics/clubb/extrapolation.F90 components/cam/src/physics/clubb/hydrostatic_module.F90 components/cam/src/physics/clubb/hyper_diffusion_4th_ord.F90 components/cam/src/physics/clubb/parameters_microphys.F90 components/cam/src/physics/clubb/parameters_radiation.F90 components/cam/src/physics/clubb/stats_rad_zm.F90 components/cam/src/physics/clubb/stats_rad_zt.F90 components/cam/src/physics/clubb/stats_sfc.F90 components/cam/src/physics/clubb/stats_subs.F90 components/cam/src/physics/clubb/stats_zm.F90 components/cam/src/physics/clubb/stats_zt.F90 components/cam/src/physics/clubb/variables_radiation_module.F90 components/clm/bld/namelist_files/namelist_defaults_clm4_0.xml models/atm/cam/src/physics/clubb/csr_matrix_class_3array.F90 models/atm/cam/src/physics/clubb/csr_matrix_module.F90
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The features include updated CLUBB (CLUBBe) and MG2, as well as modified Zhang-McFarlane scheme with trigger-memory. The implementation is based on cam5_3_66, followed by updates for clubb-core in cam5_3_83. CPP macros are used to allow for BFB to be maintained when the updates are used with default physics.