Merge branch 'develop' into feature/wjiang/Routing_GEOSroute_on_yujin

Author: gmao-rreichle

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/CMakeLists.txt

@@ -38,7 +38,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)

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/utils_topo/scrip_to_restart_topo.py

@@ -1 +1 @@
-esma_add_subdirectories  (soil routing routing_model)
+esma_add_subdirectories  (soil routing routing_model topography)

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/preproc/CMakeLists.txt

@@ -0,0 +1,2 @@
+# CMakeLists.txt for Utils/Raster/preproc/topography
+esma_add_subdirectories(ncar_topo utils_topo)