Skip to content

Commit

Permalink
don't use USE_G2CLIB
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlysonStahl-NOAA
AlysonStahl-NOAA committed Oct 9, 2024
1 parent d0b2119 commit 849c005
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 137 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/developer.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
jasper-version: version-4.0.0
ip-version: develop
g2c-version: develop
g2c-cmake-args: -DUSE_JASPER=ON -DBUILD_G2C=ON
g2c-cmake-args: -DUSE_JASPER=ON

- name: checkout
uses: actions/checkout@v4
Expand All @@ -62,7 +62,7 @@ jobs:
export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
export FCFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
export FFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_G2CLIB=ON -DUSE_JASPER=ON
cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON
make VERBOSE=1
ctest --verbose --output-on-failure --rerun-failed
gcovr --root .. -v --html-details --exclude ../tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null
Expand Down
6 changes: 1 addition & 5 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ endif()

message(STATUS "Checking if user wants to use NCEPLIBS-g2c...")
if(USE_G2CLIB)
find_package(g2c 1.9.0 CONFIG REQUIRED)

if(USE_PNG)
message(FATAL_ERROR "If USE_G2CLIB is on, USE_PNG must be off")
endif()
Expand All @@ -101,9 +99,7 @@ endif()

message(STATUS "Checking if the user wants to use Jasper...")
if(USE_JASPER)
if (NOT USE_G2CLIB)
message(FATAL_ERROR "If USE_JASPER, USE_G2CLIB must be on")
endif()
find_package(g2c 1.9.0 CONFIG REQUIRED)
# list(APPEND definitions_list -DUSE_JASPER)
# find_package(Jasper REQUIRED)
# if(JASPER_VERSION_STRING VERSION_GREATER_EQUAL "1.900.25")
Expand Down
10 changes: 4 additions & 6 deletions wgrib2/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,12 @@ if(USE_NETCDF)
target_link_libraries(obj_lib PUBLIC NetCDF::NetCDF_C)
endif()

#if(USE_JASPER)
if(USE_JASPER)
target_link_libraries(obj_lib PUBLIC g2c::g2c)
# include_directories(${JASPER_INCLUDE_DIR})
# target_include_directories(obj_lib PUBLIC ${JASPER_INCLUDE_DIR})
# target_link_libraries(obj_lib PUBLIC ${JASPER_LIBRARIES})
#endif()
endif()

if(USE_PNG)
target_link_libraries(obj_lib PUBLIC PNG::PNG)
Expand All @@ -102,10 +103,6 @@ if(OpenMP_C_FOUND)
target_link_libraries(obj_lib PUBLIC OpenMP::OpenMP_C)
endif()

if(USE_G2CLIB)
target_link_libraries(obj_lib PUBLIC g2c::g2c)
endif()

if(USE_IPOLATES)
target_link_libraries(obj_lib PUBLIC ip::ip_d)

Expand All @@ -129,6 +126,7 @@ if(USE_AEC)
target_link_libraries(wgrib2_exe PRIVATE aec)
endif()


if(USE_OPENJPEG)
include_directories(${OPENJPEG_INCLUDE_DIRS})
target_link_libraries(wgrib2_exe PRIVATE ${OPENJPEG_LIBRARIES})
Expand Down
149 changes: 25 additions & 124 deletions wgrib2/gctpc/source/makefile
View file
Original file line number Diff line number Diff line change
@@ -1,130 +1,31 @@
SHELL=/bin/sh

INCDIR =
ARCHIVE = geolib.a
LIBDIR =
SRCDIR = .
INCS = cproj.h proj.h
CC = cc
#
# makefile for gctpc, invoked by makefile for wgrib2
# does not compile fortran bridge routine
#

OBJECTS= \
$(ARCHIVE)(alberfor.o) $(ARCHIVE)(alberinv.o) \
$(ARCHIVE)(alconfor.o) $(ARCHIVE)(alconinv.o) \
$(ARCHIVE)(azimfor.o) $(ARCHIVE)(aziminv.o) \
$(ARCHIVE)(eqconfor.o) $(ARCHIVE)(eqconinv.o) \
$(ARCHIVE)(equifor.o) $(ARCHIVE)(equiinv.o) \
$(ARCHIVE)(gnomfor.o) $(ARCHIVE)(gnominv.o) \
$(ARCHIVE)(goodfor.o) $(ARCHIVE)(goodinv.o) \
$(ARCHIVE)(gvnspfor.o) $(ARCHIVE)(gvnspinv.o) \
$(ARCHIVE)(hamfor.o) $(ARCHIVE)(haminv.o) \
$(ARCHIVE)(imolwfor.o) $(ARCHIVE)(imolwinv.o) \
$(ARCHIVE)(lamazfor.o) $(ARCHIVE)(lamazinv.o) \
$(ARCHIVE)(lamccfor.o) $(ARCHIVE)(lamccinv.o) \
$(ARCHIVE)(merfor.o) $(ARCHIVE)(merinv.o) \
$(ARCHIVE)(millfor.o) $(ARCHIVE)(millinv.o) \
$(ARCHIVE)(molwfor.o) $(ARCHIVE)(molwinv.o) \
$(ARCHIVE)(obleqfor.o) $(ARCHIVE)(obleqinv.o) \
$(ARCHIVE)(omerfor.o) $(ARCHIVE)(omerinv.o) \
$(ARCHIVE)(orthfor.o) $(ARCHIVE)(orthinv.o) \
$(ARCHIVE)(polyfor.o) $(ARCHIVE)(polyinv.o) \
$(ARCHIVE)(psfor.o) $(ARCHIVE)(psinv.o) \
$(ARCHIVE)(robfor.o) $(ARCHIVE)(robinv.o) \
$(ARCHIVE)(sinfor.o) $(ARCHIVE)(sininv.o) \
$(ARCHIVE)(somfor.o) $(ARCHIVE)(sominv.o) \
$(ARCHIVE)(sterfor.o) $(ARCHIVE)(sterinv.o) \
$(ARCHIVE)(stplnfor.o) $(ARCHIVE)(stplninv.o) \
$(ARCHIVE)(tmfor.o) $(ARCHIVE)(tminv.o) \
$(ARCHIVE)(utmfor.o) $(ARCHIVE)(utminv.o) \
$(ARCHIVE)(vandgfor.o) $(ARCHIVE)(vandginv.o) \
$(ARCHIVE)(wivfor.o) $(ARCHIVE)(wivinv.o) \
$(ARCHIVE)(wviifor.o) $(ARCHIVE)(wviiinv.o) \
$(ARCHIVE)(for_init.o) $(ARCHIVE)(inv_init.o) \
$(ARCHIVE)(cproj.o) $(ARCHIVE)(report.o) \
$(ARCHIVE)(paksz.o) $(ARCHIVE)(sphdz.o) \
$(ARCHIVE)(untfz.o) $(ARCHIVE)(gctp.o) \
$(ARCHIVE)(br_gctp.o)
LIB=libgeo.a
ARFLAGS=-ruv

SOURCES = gctp.c alberfor.c alberinv.c alconfor.c alconinv.c azimfor.c \
aziminv.c eqconfor.c eqconinv.c equifor.c equiinv.c gnomfor.c \
gnominv.c goodfor.c goodinv.c gvnspfor.c gvnspinv.c hamfor.c \
haminv.c imolwfor.c imolwnv.c lamazfor.c lamazinv.c merfor.c \
merinv.c millfor.c millinv.c molwfor.c molwinv.c obleqfor.c \
obleqinv.c omerfor.c omerinv.c orthfor.c orthinv.c polyfor.c \
polyinv.c psfor.c psinv.c robfor.c robinv.c sinfor.c sininv.c \
somfor.c sominv.c sterfor.c sterinv.c stplnfor.c stplninv.c \
tmfor.c tminv.c utmfor.c utminv.c vandgfor.c vandginv.c \
wivfor.c wivinv.c wviifor.c wviiinv.c for_init.c inv_init.c \
cproj.c report.c lamccfor.c lamccinv.c paksz.c untfz.c sphdz.c \
br_gctp.c Makefile cproj.h proj.h

$(ARCHIVE): $(OBJECTS)
objs=gctp.o alberfor.o alberinv.o alconfor.o alconinv.o azimfor.o aziminv.o eqconfor.o eqconinv.o \
equifor.o equiinv.o for_init.o gnomfor.o gnominv.o goodfor.o goodinv.o gvnspfor.o gvnspinv.o \
hamfor.o haminv.o imolwfor.o imolwinv.o inv_init.o lamazfor.o lamazinv.o lamccfor.o lamccinv.o \
merfor.o merinv.o millfor.o millinv.o molwfor.o molwinv.o obleqfor.o obleqinv.o omerfor.o omerinv.o \
orthfor.o orthinv.o paksz.o polyinv.o polyfor.o psinv.o psfor.o robinv.o robfor.o sininv.o sinfor.o \
sominv.o somfor.o sphdz.o sterinv.o sterfor.o stplninv.o stplnfor.o tminv.o tmfor.o utminv.o utmfor.o \
untfz.o vandginv.o vandgfor.o wivinv.o wivfor.o wviiinv.o wviifor.o cproj.o report.o


$(ARCHIVE)(gctp.o): $(INCS)
$(ARCHIVE)(alberfor.o): $(INCS)
$(ARCHIVE)(alberinv.o): $(INCS)
$(ARCHIVE)(alconfor.o): $(INCS)
$(ARCHIVE)(alconinv.o): $(INCS)
$(ARCHIVE)(azimfor.o): $(INCS)
$(ARCHIVE)(aziminv.o): $(INCS)
$(ARCHIVE)(eqconfor.o): $(INCS)
$(ARCHIVE)(eqconinv.o): $(INCS)
$(ARCHIVE)(equifor.o): $(INCS)
$(ARCHIVE)(equiinv.o): $(INCS)
$(ARCHIVE)(for_init.o): $(INCS)
$(ARCHIVE)(gnomfor.o): $(INCS)
$(ARCHIVE)(gnominv.o): $(INCS)
$(ARCHIVE)(goodfor.o): $(INCS)
$(ARCHIVE)(goodinv.o): $(INCS)
$(ARCHIVE)(gvnspfor.o): $(INCS)
$(ARCHIVE)(gvnspinv.o): $(INCS)
$(ARCHIVE)(hamfor.o): $(INCS)
$(ARCHIVE)(haminv.o): $(INCS)
$(ARCHIVE)(imolwfor.o): $(INCS)
$(ARCHIVE)(imolwinv.o): $(INCS)
$(ARCHIVE)(inv_init.o): $(INCS)
$(ARCHIVE)(lamazfor.o): $(INCS)
$(ARCHIVE)(lamazinv.o): $(INCS)
$(ARCHIVE)(lamccfor.o): $(INCS)
$(ARCHIVE)(lamccinv.o): $(INCS)
$(ARCHIVE)(merfor.o): $(INCS)
$(ARCHIVE)(merinv.o): $(INCS)
$(ARCHIVE)(millfor.o): $(INCS)
$(ARCHIVE)(millinv.o): $(INCS)
$(ARCHIVE)(molwfor.o): $(INCS)
$(ARCHIVE)(molwinv.o): $(INCS)
$(ARCHIVE)(obleqfor.o): $(INCS)
$(ARCHIVE)(obleqinv.o): $(INCS)
$(ARCHIVE)(omerfor.o): $(INCS)
$(ARCHIVE)(omerinv.o): $(INCS)
$(ARCHIVE)(orthfor.o): $(INCS)
$(ARCHIVE)(orthinv.o): $(INCS)
$(ARCHIVE)(paksz.o): $(INCS)
$(ARCHIVE)(polyinv.o): $(INCS)
$(ARCHIVE)(polyfor.o): $(INCS)
$(ARCHIVE)(psinv.o): $(INCS)
$(ARCHIVE)(psfor.o): $(INCS)
$(ARCHIVE)(robinv.o): $(INCS)
$(ARCHIVE)(robfor.o): $(INCS)
$(ARCHIVE)(sininv.o): $(INCS)
$(ARCHIVE)(sinfor.o): $(INCS)
$(ARCHIVE)(sominv.o): $(INCS)
$(ARCHIVE)(somfor.o): $(INCS)
$(ARCHIVE)(sphdz.o): $(INCS)
$(ARCHIVE)(sterinv.o): $(INCS)
$(ARCHIVE)(sterfor.o): $(INCS)
$(ARCHIVE)(stplninv.o): $(INCS)
$(ARCHIVE)(stplnfor.o): $(INCS)
$(ARCHIVE)(tminv.o): $(INCS)
$(ARCHIVE)(tmfor.o): $(INCS)
$(ARCHIVE)(utminv.o): $(INCS)
$(ARCHIVE)(utmfor.o): $(INCS)
$(ARCHIVE)(untfz.o): $(INCS)
$(ARCHIVE)(vandginv.o): $(INCS)
$(ARCHIVE)(vandgfor.o): $(INCS)
$(ARCHIVE)(wivinv.o): $(INCS)
$(ARCHIVE)(wivfor.o): $(INCS)
$(ARCHIVE)(wviiinv.o): $(INCS)
$(ARCHIVE)(wviifor.o): $(INCS)
$(ARCHIVE)(cproj.o): $(INCS)
$(ARCHIVE)(report.o): $(INCS)
$(ARCHIVE)(br_gctp.o): $(INCS)
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) ${DEFS} $<

$(LIB): $(objs)
ar $(ARFLAGS) ${LIB} $(objs)

clean:
touch junk.o
rm *.o
touch libgeo.a
rm libgeo.a

0 comments on commit 849c005

Please sign in to comment.