Skip to content

Commit

Permalink
merge to head of development
Browse files Browse the repository at this point in the history
  • Loading branch information
peverwhee committed Nov 14, 2024
2 parents a3f7852 + 24a5c21 commit 2a794a5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "ccpp-framework"]
path = ccpp_framework
url = https://github.com/NCAR/ccpp-framework
fxtag = 2024-10-31-dev
fxtag = 2024-11-07-dev
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/NCAR/ccpp-framework
[submodule "history"]
Expand All @@ -19,8 +19,8 @@
fxDONOTUSEurl = https://github.com/MPAS-Dev/MPAS-Model.git
[submodule "ncar-physics"]
path = src/physics/ncar_ccpp
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_06_000
url = https://github.com/peverwhee/atmospheric_physics
fxtag = cfe51a37eb2f8b4906ea0acde7b26ae23159d240
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
[submodule "ccs_config"]
Expand Down
2 changes: 1 addition & 1 deletion src/physics/ncar_ccpp
Submodule ncar_ccpp updated 94 files
+1 −11 .github/workflows/test.yaml
+0 −201 LICENSE
+34 −0 LICENSE.txt
+0 −154 doc/ChangeLog
+58 −134 doc/NamesNotInDictionary.txt
+0 −0 dry_adiabatic_adjust/dadadj.F90
+0 −0 dry_adiabatic_adjust/dadadj.meta
+0 −0 dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90
+0 −0 dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta
+0 −0 dry_adiabatic_adjust/dadadj_namelist.xml
+0 −0 held_suarez/held_suarez_1994.F90
+0 −0 held_suarez/held_suarez_1994.meta
+0 −0 kessler/kessler.F90
+0 −0 kessler/kessler.meta
+0 −0 kessler/kessler_update.F90
+0 −0 kessler/kessler_update.meta
+233 −0 musica/micm/musica_ccpp_micm.F90
+60 −0 musica/musica_ccpp.F90
+1 −43 musica/musica_ccpp.meta
+0 −13 musica/musica_ccpp_namelist.xml
+3 −5 musica/musica_ccpp_util.F90
+0 −142 schemes/musica/micm/musica_ccpp_micm.F90
+0 −136 schemes/musica/micm/musica_ccpp_micm_util.F90
+0 −150 schemes/musica/musica_ccpp.F90
+0 −232 schemes/musica/tuvx/musica_ccpp_tuvx.F90
+0 −171 schemes/musica/tuvx/musica_ccpp_tuvx_height_grid.F90
+0 −70 schemes/musica/tuvx/musica_ccpp_tuvx_temperature.F90
+0 −58 schemes/sima_diagnostics/kessler_diagnostics.F90
+0 −41 schemes/sima_diagnostics/kessler_diagnostics.meta
+0 −78 schemes/sima_diagnostics/scheme_diagnostics_template.F90
+0 −180 schemes/sima_diagnostics/sima_state_diagnostics.F90
+0 −191 schemes/sima_diagnostics/sima_state_diagnostics.meta
+0 −48 schemes/sima_diagnostics/sima_tend_diagnostics.F90
+0 −53 schemes/sima_diagnostics/sima_tend_diagnostics.meta
+0 −218 schemes/sima_diagnostics/tropopause_diagnostics.F90
+0 −191 schemes/sima_diagnostics/tropopause_diagnostics.meta
+0 −1,455 schemes/tropopause_find/tropopause_find.F90
+0 −305 schemes/tropopause_find/tropopause_find.meta
+0 −0 suite_cam4.xml
+0 −0 suite_cam6.xml
+0 −0 suite_cam6_silhs.xml
+12 −0 suite_cam7.xml
+0 −4 suite_held_suarez_1994.xml
+0 −5 suite_kessler.xml
+0 −0 suite_musica.xml
+0 −2 suite_tj2016.xml
+0 −23 suites/suite_cam7.xml
+2 −2 test/CMakeLists.txt
+2 −5 test/cmake/TestUtils.cmake
+5 −19 test/docker/Dockerfile.musica
+0 −80 test/docker/Dockerfile.musica.no_install
+6 −40 test/musica/CMakeLists.txt
+0 −25 test/musica/micm/CMakeLists.txt
+4 −4 test/musica/micm/configs/chapman/reactions.json
+1 −1 test/musica/micm/configs/chapman/species.json
+0 −131 test/musica/micm/test_micm_util.F90
+1 −2 test/musica/musica_ccpp_namelist.F90
+109 −130 test/musica/test_musica_api.F90
+0 −56 test/musica/tuvx/CMakeLists.txt
+0 −2,077 test/musica/tuvx/configs/ts1_tsmlt.json
+0 −103 test/musica/tuvx/test_tuvx_height_grid.F90
+0 −64 test/musica/tuvx/test_tuvx_temperature.F90
+0 −0 test/test_sdfs/suite_dry_adiabatic_adjust.xml
+0 −0 test/test_sdfs/suite_tj2016_precip.xml
+0 −0 test/test_sdfs/suite_tj2016_sfc_pbl_hs.xml
+0 −12 test/test_suites/suite_tropopause_find.xml
+0 −38 test/valgrind.supp
+0 −0 tj2016/tj2016_precip.F90
+0 −0 tj2016/tj2016_precip.meta
+0 −0 tj2016/tj2016_sfc_pbl_hs.F90
+0 −0 tj2016/tj2016_sfc_pbl_hs.meta
+0 −50 to_be_ccppized/ccpp_const_utils.F90
+0 −152 to_be_ccppized/coords_1d.F90
+0 −1,181 to_be_ccppized/linear_1d_operators.F90
+0 −130 to_be_ccppized/vertical_diffusion_solver.F90
+0 −0 utilities/geopotential_temp.F90
+0 −0 utilities/geopotential_temp.meta
+28 −0 utilities/physics_tendency_updaters.F90
+49 −0 utilities/physics_tendency_updaters.meta
+0 −0 utilities/qneg.F90
+0 −0 utilities/qneg.meta
+0 −0 utilities/qneg_namelist.xml
+0 −0 utilities/state_converters.F90
+0 −0 utilities/state_converters.meta
+0 −0 utilities/static_energy.F90
+0 −0 utilities/static_energy.meta
+0 −0 zhang_mcfarlane/zm_conv_convtran.F90
+0 −0 zhang_mcfarlane/zm_conv_convtran.meta
+0 −0 zhang_mcfarlane/zm_conv_evap.F90
+0 −0 zhang_mcfarlane/zm_conv_evap.meta
+0 −0 zhang_mcfarlane/zm_conv_momtran.F90
+0 −0 zhang_mcfarlane/zm_conv_momtran.meta
+0 −0 zhang_mcfarlane/zm_convr.F90
+0 −0 zhang_mcfarlane/zm_convr.meta

0 comments on commit 2a794a5

Please sign in to comment.