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

rename top level "wgrib2" directory as "src" #156

Closed
wants to merge 6 commits into from
Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 14 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,34 +137,34 @@ endif()

# write config.h
message(STATUS "Writing config.h...")
FILE(WRITE "wgrib2/config.h" "/* config.h generated by cmake */\n")
FILE(APPEND "wgrib2/config.h" "#ifndef _CONFIG_H\n")
FILE(APPEND "wgrib2/config.h" "#define _CONFIG_H\n")
FILE(WRITE "src/config.h" "/* config.h generated by cmake */\n")
FILE(APPEND "src/config.h" "#ifndef _CONFIG_H\n")
FILE(APPEND "src/config.h" "#define _CONFIG_H\n")

FOREACH(var IN ITEMS USE_NETCDF3 USE_REGEX USE_TIGGE USE_MYSQL
USE_IPOLATES USE_UDF USE_OPENMP USE_PROJ4 USE_WMO_VALIDATION DISABLE_TIMEZONE
DISABLE_ALARM USE_NAMES USE_G2CLIB USE_PNG USE_JASPER USE_OPENJPEG MAKE_FTN_API USE_AEC BUILD_COMMENTS)

# FILE(APPEND "wgrib2/config.h" "#test ${var} ${${var}}\n")
# FILE(APPEND "src/config.h" "#test ${var} ${${var}}\n")
if(${var} STREQUAL ON)
FILE(APPEND "wgrib2/config.h" "#define ${var}\n")
FILE(APPEND "src/config.h" "#define ${var}\n")
elseif(${var} STREQUAL OFF)
FILE(APPEND "wgrib2/config.h" "// #define ${var}\n")
FILE(APPEND "src/config.h" "// #define ${var}\n")
elseif(${${var}} MATCHES " ")
FILE(APPEND "wgrib2/config.h" "#define ${var} \"${${var}}\"\n")
FILE(APPEND "src/config.h" "#define ${var} \"${${var}}\"\n")
else()
FILE(APPEND "wgrib2/config.h" "#define ${var} ${${var}}\n")
FILE(APPEND "src/config.h" "#define ${var} ${${var}}\n")
endif()
ENDFOREACH()

FILE(APPEND "wgrib2/config.h" "#define CC \"${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ID}\"\n")
FILE(APPEND "wgrib2/config.h" "#define FORTRAN \"${CMAKE_Fortran_COMPILER} ${CMAKE_Fortran_COMPILER_ID}\"\n")
FILE(APPEND "wgrib2/config.h" "#define CPPFLAGS \"${CMAKE_C_FLAGS}\"\n")
FILE(APPEND "wgrib2/config.h" "#define FFLAGS \"${CMAKE_Fortran_FLAGS}\"\n")
FILE(APPEND "wgrib2/config.h" "#endif\n")
FILE(APPEND "src/config.h" "#define CC \"${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ID}\"\n")
FILE(APPEND "src/config.h" "#define FORTRAN \"${CMAKE_Fortran_COMPILER} ${CMAKE_Fortran_COMPILER_ID}\"\n")
FILE(APPEND "src/config.h" "#define CPPFLAGS \"${CMAKE_C_FLAGS}\"\n")
FILE(APPEND "src/config.h" "#define FFLAGS \"${CMAKE_Fortran_FLAGS}\"\n")
FILE(APPEND "src/config.h" "#endif\n")

message(STATUS "Adding wgrib2, aux_probs subdirectories...")
add_subdirectory(wgrib2)
add_subdirectory(src)
add_subdirectory(aux_progs)

if(BUILD_LIB)
Expand Down
6 changes: 3 additions & 3 deletions INSTALLING
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ Compile the wgrib2 using gnu make

Try executing wgrib2

wgrib2/wgrib2 -config
src/wgrib2 -config

Copy wgrib2 to SOMEPLACE

cygwin/linux/unix: cp wgrib2/wgrib2 SOMEPLACE
cygwin/linux/unix: cp src/wgrib2 SOMEPLACE


Not So Quick Directions
Expand All @@ -60,7 +60,7 @@ Edit the file "makefile" and select the desired options:
# feature, subroutines can allocated/deallocated arrays
# disable_timezone: some OS do not handle time zones in POSIX maner
#
# the flags are stored in wgrib2/config.h
# the flags are stored in src/config.h
#
# Warning do not set both USE_NETCDF3 and USE_NETCDF4 to one

Expand Down
2 changes: 1 addition & 1 deletion docs/README.cygwin
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Compile
export FC=gfortran
(you may want to alter the "makefile" to make a custom configuration)
make
(this should make wgrib2/wgrib2.exe)
(this should make src/wgrib2.exe)


2/23/2021: wgrib2 v3.0.1+ Cygwin and zlib
Expand Down
2 changes: 1 addition & 1 deletion docs/README.icc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Bash:
export CC=icc
export FC=ifort
export COMP_SYS=intel_linux for linux only
make makes wgrib2/wgrib2
make makes src/wgrib2
make lib makes lib/*.a lib/*.mod for wgrib2api


Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions wgrib2/CMakeLists.txt → src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ target_compile_definitions(obj_lib PUBLIC ${definitions_list})
# Write wgrib2_meta.h. This is installed and contains pre-processor
# defines for other packages using wgrib2.
configure_file (
"${PROJECT_SOURCE_DIR}/wgrib2/wgrib2_meta.h.in"
"${PROJECT_BINARY_DIR}/wgrib2/wgrib2_meta.h"
"${PROJECT_SOURCE_DIR}/src/wgrib2_meta.h.in"
"${PROJECT_BINARY_DIR}/src/wgrib2_meta.h"
)

if(BUILD_LIB)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
130 changes: 130 additions & 0 deletions src/gctpc/source/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@

INCDIR =
ARCHIVE = geolib.a
LIBDIR =
SRCDIR = .
INCS = cproj.h proj.h
CC = cc

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)

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)


$(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)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
Loading