Skip to content
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

add alphabranch to tests #292

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/fleximod_test.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
on:
push:
branches: [ master ]
branches: [ master, cesm3.0-alphabranch ]
pull_request:
branches: [ master ]
branches: [ master, cesm3.0-alphabranch ]
jobs:
fleximod-test:
runs-on: ubuntu-latest
Expand All @@ -16,7 +16,12 @@ jobs:
- id: run-fleximod
run: |
$GITHUB_WORKSPACE/bin/git-fleximod update
$GITHUB_WORKSPACE/bin/git-fleximod test
echo
echo "Update complete, checking status"
echo
$GITHUB_WORKSPACE/bin/git-fleximod status | tee status.out
grep testfails status.out || exit 0
exit 1
# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
url = https://github.com/ESCOMP/MOM_interface
fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface
fxrequired = ToplevelRequired
fxtag = mi_240823
fxtag = mi_240923

[submodule "cism"]
path = components/cism
Expand Down Expand Up @@ -114,7 +114,7 @@
path = components/ww3
url = https://github.com/ESCOMP/WW3_interface
fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface
fxtag = ww3i_0.0.14
fxtag = main_0.0.14
fxrequired = ToplevelRequired

[submodule "mizuroute"]
Expand Down
2 changes: 1 addition & 1 deletion components/clm
Submodule clm updated 92 files
+0 −3 .gitignore
+1 −1 .gitmodules
+12 −12 README
+2 −2 README.md
+2 −2 README_GITFLEXIMOD.rst
+53 −0 WhatsNewInCTSM5.3.md
+40 −6 bld/CLMBuildNamelist.pm
+8 −8 bld/README
+297 −319 bld/namelist_files/namelist_defaults_ctsm.xml
+1 −1 bld/namelist_files/namelist_defaults_fire_emis.xml
+27 −11 bld/namelist_files/namelist_definition_ctsm.xml
+62 −4 bld/unit_testers/build-namelist_test.pl
+2 −2 cime_config/SystemTests/lvg.py
+2 −2 cime_config/testdefs/ExpectedTestFails.xml
+71 −91 cime_config/testdefs/testlist_clm.xml
+1 −0 cime_config/testdefs/testmods_dirs/clm/ExcessIceStreams/include_user_mods
+1 −2 cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm
+1 −1 cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm
+2 −0 cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm
+3 −0 cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/shell_commands
+0 −1 cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/user_nl_clm
+1 −1 cime_config/testdefs/testmods_dirs/clm/Hillslope/user_nl_clm
+1 −0 cime_config/testdefs/testmods_dirs/clm/SNICARFRC/include_user_mods
+1 −1 cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm
+0 −16 cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README
+0 −2 cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm
+1 −4 cime_config/testdefs/testmods_dirs/clm/f09_dec1990Start_GU_LULCC/user_nl_clm
+1 −0 cime_config/testdefs/testmods_dirs/clm/nofire/include_user_mods
+0 −1 cime_config/testdefs/testmods_dirs/clm/nofire/shell_commands
+3 −0 cime_config/testdefs/testmods_dirs/clm/nofireemis/shell_commands
+1 −0 cime_config/testdefs/testmods_dirs/clm/o3lombardozzi2015/include_user_mods
+1 −0 cime_config/testdefs/testmods_dirs/clm/pauseResume/include_user_mods
+1 −0 cime_config/testdefs/testmods_dirs/clm/prescribed/include_user_mods
+1 −0 cime_config/testdefs/testmods_dirs/clm/pts/include_user_mods
+1 −1 cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm
+1 −1 cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm
+1 −0 cime_config/testdefs/testmods_dirs/clm/waccmx_offline/include_user_mods
+0 −3 cime_config/usermods_dirs/NEON/FATES/defaults/user_nl_clm
+0 −3 cime_config/usermods_dirs/NEON/defaults/user_nl_clm
+1 −1 cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm
+1 −1 cime_config/usermods_dirs/_includes/cmip6_glaciers_virtual_antarctica/user_nl_clm
+450 −1 doc/ChangeLog
+3 −0 doc/ChangeSum
+0 −0 doc/README.NUOPC_driver.md
+7 −10 doc/source/tech_note/Glacier/CLM50_Tech_Note_Glacier.rst
+2 −89 doc/source/users_guide/using-clm-tools/building-the-clm-tools.rst
+4 −22 doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst
+0 −8 python/ctsm/subset_data.py
+1 −3 python/ctsm/test/test_sys_gen_mksurfdata_namelist.py
+1 −1 python/ctsm/test/test_unit_subset_data.py
+6 −6 python/ctsm/test/testinputs/default_data.cfg
+15 −8 python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
+24 −71 python/ctsm/toolchain/gen_mksurfdata_namelist.py
+17 −11 src/biogeochem/FireEmisFactorsMod.F90
+1 −1 src/fates
+2 −1 src/main/clm_initializeMod.F90
+111 −95 src/main/glc2lndMod.F90
+30 −7 src/main/glcBehaviorMod.F90
+19 −1 src/main/lnd2glcMod.F90
+66 −1 src/main/surfrdMod.F90
+1 −1 src/main/test/glcBehavior_test/test_glcBehavior.pf
+56 −13 src/main/test/topo_test/test_topo.pf
+16 −42 src/utils/clmfates_interfaceMod.F90
+0 −45 tools/README
+0 −58 tools/README.testing
+0 −151 tools/mkprocdata_map/README
+0 −25 tools/mkprocdata_map/README.filedescriptions
+0 −202 tools/mkprocdata_map/mkprocdata_map_all
+0 −57 tools/mkprocdata_map/mkprocdata_map_functions.bash
+0 −250 tools/mkprocdata_map/mkprocdata_map_wrap
+0 −1 tools/mkprocdata_map/src/Filepath
+0 −10 tools/mkprocdata_map/src/Makefile
+0 −360 tools/mkprocdata_map/src/Makefile.common
+0 −327 tools/mkprocdata_map/src/Mkdepends
+0 −8 tools/mkprocdata_map/src/Srcfiles
+0 −11 tools/mkprocdata_map/src/constMod.F90
+0 −282 tools/mkprocdata_map/src/fileutils.F90
+0 −78 tools/mkprocdata_map/src/fmain.F90
+0 −289 tools/mkprocdata_map/src/gridmapMod.F90
+0 −525 tools/mkprocdata_map/src/mkprocdata_map.F90
+0 −41 tools/mkprocdata_map/src/nanMod.F90
+0 −164 tools/mkprocdata_map/src/shr_file_mod.F90
+0 −19 tools/mkprocdata_map/src/shr_kind_mod.F90
+29 −8 tools/mksurfdata_esmf/Makefile
+4 −8 tools/mksurfdata_esmf/README.filecopies
+4 −0 tools/mksurfdata_esmf/README.md
+38 −42 tools/mksurfdata_esmf/gen_mksurfdata_namelist.xml
+6 −0 tools/mksurfdata_esmf/src/mkfileMod.F90
+21 −3 tools/mksurfdata_esmf/src/mkglacierregionMod.F90
+12 −2 tools/mksurfdata_esmf/src/mksoiltexMod.F90
+4 −4 tools/site_and_regional/default_data_1850.cfg
+6 −6 tools/site_and_regional/default_data_2000.cfg
2 changes: 1 addition & 1 deletion components/ww3
Submodule ww3 updated 2 files
+1 −1 .gitmodules
+1 −1 WW3
Loading