Skip to content

Commit

Permalink
Update externals
Browse files Browse the repository at this point in the history
Address review comment
Fix testlist (including longer test times and more PEs)
  • Loading branch information
Steve Goldhaber committed Nov 11, 2024
1 parent 423db6d commit 892b338
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
[submodule "atmos_phys"]
path = src/atmos_phys
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_06_009
fxtag = atmos_phys0_05_001
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics

[submodule "camnor_phys"]
path = src/physics/camnor_phys
url = https://github.com/NorESMhub/CAM-Nor-physics
fxtag = camnor_noresm_v0.0.5
fxtag = camnor_noresm_v0.0.6
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/CAM-Nor-physics.git

Expand Down
4 changes: 2 additions & 2 deletions bld/config_files/definition.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ Option to turn on waccmx thermosphere/ionosphere extension: 0 => no, 1 => yes
<entry id="ionosphere" valid_values="none,wxie" value="none">
Ionosphere model used in WACCMX.
</entry>
<entry id="phys" valid_values="cam3,cam4,cam5,cam6,cam7,held_suarez,adiabatic,kessler,tj2016,grayrad,spcam_sam1mom,spcam_m2005" value="">
Physics package: cam3, cam4, cam5, cam6, cam7, held_suarez, adiabatic, kessler, tj2016, grayrad, spcam_sam1mom, spcam_m2005.
<entry id="phys" valid_values="cam4,cam5,cam6,cam7,held_suarez,adiabatic,kessler,tj2016,grayrad,spcam_sam1mom,spcam_m2005" value="">
Physics package: cam4, cam5, cam6, cam7, held_suarez, adiabatic, kessler, tj2016, grayrad, spcam_sam1mom, spcam_m2005.
</entry>
<entry id="hemco" valid_values="0,1" value="0">
Switch to turn on Harmonized Emissions Component (HEMCO) for chemistry: 0 => no, 1 => yes.
Expand Down
6 changes: 3 additions & 3 deletions cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@
<machine name="betzy" compiler="intel" category="prealpha_noresm"/>
</machines>
<options>
<option name="wallclock">00:10:00</option>
<option name="wallclock">00:20:00</option>
</options>
</test>

<test compset="F2000climo" grid="ne30pg3_ne30pg3_mtn14" name="ERP_D_Ln9_P36" testmods="cam/outfrq9s">
<test compset="F2000climo" grid="ne30pg3_ne30pg3_mtn14" name="ERP_D_Ln9_P512" testmods="cam/outfrq9s">
<machines>
<machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
</machines>
<options>
<option name="wallclock">00:10:00</option>
<option name="wallclock">00:25:00</option>
</options>
</test>

Expand Down
2 changes: 1 addition & 1 deletion src/atmos_phys
Submodule atmos_phys updated 42 files
+1 −11 .github/workflows/test.yaml
+0 −27 doc/ChangeLog
+113 −122 doc/NamesNotInDictionary.txt
+0 −0 schemes/cam_diagnostics/tropopause_diagnostics.F90
+0 −0 schemes/cam_diagnostics/tropopause_diagnostics.meta
+54 −31 schemes/musica/micm/micm_util.F90
+51 −56 schemes/musica/micm/musica_ccpp_micm.F90
+44 −70 schemes/musica/musica_ccpp.F90
+1 −43 schemes/musica/musica_ccpp.meta
+1 −1 schemes/musica/musica_ccpp_namelist.xml
+3 −5 schemes/musica/musica_ccpp_util.F90
+31 −179 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 −4 suites/suite_cam7.xml
+0 −4 suites/suite_held_suarez_1994.xml
+0 −5 suites/suite_kessler.xml
+0 −2 suites/suite_tj2016.xml
+2 −5 test/cmake/TestUtils.cmake
+2 −10 test/docker/Dockerfile.musica
+0 −80 test/docker/Dockerfile.musica.no_install
+7 −28 test/musica/CMakeLists.txt
+2 −1 test/musica/micm/CMakeLists.txt
+69 −32 test/musica/micm/test_micm_util.F90
+2 −2 test/musica/musica_ccpp_namelist.F90
+123 −130 test/musica/test_musica_api.F90
+0 −56 test/musica/tuvx/CMakeLists.txt
+18 −0 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 −38 test/valgrind.supp
+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 comments on commit 892b338

Please sign in to comment.