Skip to content

GitFlow: Merge develop into v12 - 2026Jan07 #1195

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.

Sign up for GitHub

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

Merged
sdrabenh merged 40 commits into from
Jan 16, 2026
Merged

GitFlow: Merge develop into v12 - 2026Jan07 #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
7b77afb
Fixes #1069. Clean up WW3 Cmake
mathomp4 Mar 5, 2025
3a6e68c
disable RUNOFF in DataAtm; let DISCHARGE and CALVING propagate to be …
zhaobin74 Jul 9, 2025
5a8f7c5
add remapped friver and licalvf collections and provide DISCHARGE and…
zhaobin74 Jul 10, 2025
d31d62c
fixed a typo
zhaobin74 Jul 11, 2025
a7f5f53
claving causes huge frazil generation at isolated locations near ices…
zhaobin74 Jul 28, 2025
bb98b3f
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribu…
sdrabenh Aug 20, 2025
2327fd3
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribu…
mathomp4 Sep 11, 2025
98e1d86
Topo docs & cleanup: add README_topo.md; move generate_topo.sh to pre…
biljanaorescanin Oct 3, 2025
9148275
remove example to make it simetric to other file
biljanaorescanin Oct 3, 2025
8ab4b3b
fix example
biljanaorescanin Oct 3, 2025
0f4d145
moved to obsolete
biljanaorescanin Oct 3, 2025
faa3486
add more text to readme
biljanaorescanin Oct 3, 2025
70089f5
update readme
biljanaorescanin Oct 3, 2025
4be1a05
update readme again
biljanaorescanin Oct 3, 2025
22f12f0
v11: Testing reusable github actions
mathomp4 Oct 6, 2025
d3a6288
Turn off ifx for now
mathomp4 Oct 6, 2025
1867aa2
Move spack CI into reusable as well
mathomp4 Oct 6, 2025
776d025
Use fixture ref and repo
mathomp4 Oct 6, 2025
9b44fa3
Merge pull request #1171 from GEOS-ESM/feature/central-workflows
mathomp4 Oct 7, 2025
fb1bacd
Merge branch 'develop' into feature/borescan_cleanup_and_documentation
biljanaorescanin Oct 8, 2025
261c116
add to readme and move
biljanaorescanin Oct 8, 2025
314d70d
move utils_topo dir to new location
biljanaorescanin Oct 8, 2025
9fe7066
add cmake file
biljanaorescanin Oct 8, 2025
53932bf
add dir to build
biljanaorescanin Oct 8, 2025
504f058
Update push-to-dev
mathomp4 Oct 9, 2025
fada483
Merge branch 'develop' into feature/borescan_cleanup_and_documentation
biljanaorescanin Oct 14, 2025
e0af2c5
v11: Updaates for GCC 15 and Moist
mathomp4 Oct 16, 2025
f4ae3cc
we don't need all this
biljanaorescanin Nov 3, 2025
3869f67
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribu…
mathomp4 Nov 21, 2025
5611f5b
Fix for gfortran
mathomp4 Nov 21, 2025
e31c2de
Merge pull request #1176 from GEOS-ESM/bugfix/gcc15-moist
sdrabenh Nov 24, 2025
85adc57
Merge branch 'develop' into feature/mathomp4/1069-clean-ww3-cmake
mathomp4 Nov 24, 2025
c915c75
Merge branch 'develop' into feature/borescan_cleanup_and_documentation
biljanaorescanin Dec 4, 2025
c3e435d
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribu…
sdrabenh Jan 6, 2026
7cafa34
Merge pull request #1072 from GEOS-ESM/feature/mathomp4/1069-clean-ww…
sdrabenh Jan 6, 2026
71c6370
Merge branch 'develop' into feature/borescan_cleanup_and_documentation
sdrabenh Jan 6, 2026
982e04d
Merge pull request #1170 from GEOS-ESM/feature/borescan_cleanup_and_d…
sdrabenh Jan 6, 2026
f072071
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribu…
sdrabenh Jan 6, 2026
ec98d1c
Merge pull request #1136 from GEOS-ESM/feature/zhaobin74/improve-runo…
sdrabenh Jan 6, 2026
9892da7
Merge branch 'develop' into feature/sdrabenh/gcm_v12
mathomp4 Jan 7, 2026
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
1 change: 0 additions & 1 deletion ...cm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ else ()
target_compile_definitions(${this} PRIVATE STDC)
endif ()

esma_add_subdirectories (@ncar_topo utils_topo)

ecbuild_add_executable (TARGET CombineRasters.x SOURCES CombineRasters.F90 LIBS MAPL ${this})
ecbuild_add_executable (TARGET mkCatchParam.x SOURCES mkCatchParam.F90 LIBS MAPL ${this} OpenMP::OpenMP_Fortran)
Expand Down
99 changes: 0 additions & 99 deletions ...cs_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/utils_topo/scrip_to_restart_topo.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...cm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/preproc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
esma_add_subdirectories (soil routing)
esma_add_subdirectories (soil routing topography)
0 ..._GridComp/Utils/Raster/makebcs/.gitignore → ...tils/Raster/preproc/topography/.gitignore
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions .../GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/preproc/topography/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# CMakeLists.txt for Utils/Raster/preproc/topography
esma_add_subdirectories(ncar_topo utils_topo)
Loading
Loading