Skip to content

v12 GCM: clean up programs etc related to regrid.pl #1157

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

Open
gmao-rreichle wants to merge 11 commits into
base: feature/sdrabenh/gcm_v12
Choose a base branch
from
Open

v12 GCM: clean up programs etc related to regrid.pl #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aa2bf85
removed obsolete program used by regrid.pl (mk_GEOSldasRestarts.F90)
gmao-rreichle Feb 12, 2025
0cfd846
remove more files not needed
weiyuan-jiang Feb 27, 2025
fae84e9
Merge branch 'develop' into feature/rreichle/remove-regridpl
gmao-rreichle Mar 26, 2025
6e66fd4
Merge branch 'develop' into feature/rreichle/remove-regridpl
gmao-rreichle Apr 9, 2025
d0cea82
Merge branch 'develop' into feature/rreichle/remove-regridpl
gmao-rreichle May 2, 2025
b4b666c
removed additional obsolete "regrid" files
gmao-rreichle Aug 1, 2025
a5e2e3f
Merge branch 'develop' into feature/rreichle/remove-regridpl (manuall…
gmao-rreichle Aug 1, 2025
e96098d
removed names of obsolete files from CMakeLists.txt
gmao-rreichle Aug 1, 2025
c50710a
Merge branch 'develop' into feature/rreichle/remove-regridpl
gmao-rreichle Sep 10, 2025
9800bcf
Merge branch 'feature/sdrabenh/gcm_v12' into feature/rreichle/remove-…
mathomp4 Sep 10, 2025
6b5434e
Merge branch 'feature/sdrabenh/gcm_v12' into feature/rreichle/remove-…
mathomp4 Mar 25, 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
8 changes: 0 additions & 8 deletions ...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 @@ -11,18 +11,10 @@ zip.c
util.c
)

if(NOT FORTRAN_COMPILER_SUPPORTS_FINDLOC)
list(APPEND srcs findloc.F90)
endif ()

set_source_files_properties(mkMITAquaRaster.F90 PROPERTIES COMPILE_FLAGS "${BYTERECLEN}")

esma_add_library(${this} SRCS ${srcs} DEPENDENCIES MAPL GEOS_SurfaceShared GEOS_LandShared ESMF::ESMF NetCDF::NetCDF_Fortran OpenMP::OpenMP_Fortran)

if(NOT FORTRAN_COMPILER_SUPPORTS_FINDLOC)
target_compile_definitions(${this} PRIVATE USE_EXTERNAL_FINDLOC)
endif ()

# MAT NOTE This should use find_package(ZLIB) but Baselibs currently
# confuses find_package(). This is a hack until Baselibs is
# reorganized.
Expand Down
30 changes: 0 additions & 30 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/findloc.F90
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions .../GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/mod_process_hres_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ MODULE process_hres_data
use lsm_routines, ONLY: sibalb
use LogRectRasterizeMod, ONLY: SRTM_maxcat

#if defined USE_EXTERNAL_FINDLOC
use findloc_mod, only: findloc
#endif

implicit none

include 'netcdf.inc'
Expand Down
6 changes: 0 additions & 6 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,12 @@ set(srcs
)

set (exe_srcs
Scale_Catch.F90
Scale_CatchCN.F90
cv_SaltRestart.F90
SaltIntSplitter.F90
SaltImpConverter.F90
mk_CICERestart.F90
mk_CatchCNRestarts.F90
mk_CatchRestarts.F90
mk_LakeLandiceSaltRestarts.F90
mk_RouteRestarts.F90
mk_GEOSldasRestarts.F90
mk_catchANDcnRestarts.F90
)

Expand All @@ -33,7 +28,6 @@ foreach (src ${exe_srcs})
LIBS MAPL GFTL_SHARED::gftl-shared GEOS_SurfaceShared GEOSroute_GridComp GEOS_LandShared GEOS_CatchCNShared ${this})
endforeach ()

install(PROGRAMS mk_Restarts DESTINATION bin)
foreach (src ${exe_srcs})
string (REGEX REPLACE ".F90" ".x" exe ${src})
string (REGEX REPLACE ".F90" "" lname ${src})
Expand Down
Loading
Loading