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.

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

Include create_xgrid_util.h header file #263

Merged
merged 5 commits into from
Dec 19, 2023
Merged

Include create_xgrid_util.h header file #263

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ef317f
add create_xgrid_util to make_coupler
Dec 6, 2023
e21049f
add create_xgrid_util.h to all places with create_xgrid.h
Dec 6, 2023
4f31723
move globals.h
Dec 15, 2023
db6a985
remove extra lines in makefile.am
Dec 15, 2023
8f9bbd3
one more extra line
Dec 15, 2023
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
3 changes: 2 additions & 1 deletion tools/cubic_utils/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
bin_PROGRAMS = make_remap_file

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
$(NETCDF_CFLAGS) \
-I$(top_srcdir)/tools/fregrid
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

Expand Down
4 changes: 1 addition & 3 deletions tools/cubic_utils/make_remap_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include "mosaic_util.h"
#include "tool_util.h"
#include "create_xgrid.h"
#include "create_xgrid_util.h"

#define EPSLN (1.e-10)
#define D2R (M_PI/180)
Expand Down Expand Up @@ -556,6 +557,3 @@ int main(int argc, char* argv[])
return 0;

} /* end of main */



3 changes: 2 additions & 1 deletion tools/make_coupler_mosaic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ if WITH_MPI
endif

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
$(NETCDF_CFLAGS) \
-I$(top_srcdir)/tools/fregrid
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think other tools (make_coupler mosaic and the others) should not depend on the fregrid tool. What is this tool picking up from the fregrid directory that the AM flags now have -I$(top_srcdir)/tools/fregrid ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code does not compile without that include in AM_CFLAGS. I think it's because create_xgrid.h needs global.h which is in the fregrid directory.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mlee03 So perhaps it makes more sense to put global.h in the same place as constant.h - in directory libfrencutils ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved global.h to libfrenctools. Ready for final review :)

LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_coupler_mosaic_SOURCES = make_coupler_mosaic.c
Expand Down
1 change: 1 addition & 0 deletions tools/make_coupler_mosaic/make_coupler_mosaic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#include "mpp_domain.h"
#include "mosaic_util.h"
#include "create_xgrid.h"
#include "create_xgrid_util.h"
#include "read_mosaic.h"
#define print_grid 0

Expand Down
4 changes: 2 additions & 2 deletions tools/make_hgrid/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif


AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
$(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_hgrid_SOURCES = create_conformal_cubic_grid.c \
Expand All @@ -34,7 +34,7 @@ make_hgrid_SOURCES = create_conformal_cubic_grid.c \
create_lonlat_grid.c \
make_hgrid.c
make_hgrid_LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a $(LDADD)

make_hgrid_parallel_SOURCES = $(make_hgrid_SOURCES)
make_hgrid_parallel_CFLAGS = -Duse_libMPI $(MPI_CFLAGS) $(AM_CFLAGS)
make_hgrid_parallel_LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils_mpi.a $(LDADD) $(MPI_CLDFLAGS)
2 changes: 1 addition & 1 deletion tools/make_hgrid/create_lonlat_grid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "constant.h"
#include "create_hgrid.h"
#include "create_xgrid.h"

#include "create_xgrid_util.h"

/*********************************************************************************
some private routines used in this file
Expand Down
2 changes: 1 addition & 1 deletion tools/make_quick_mosaic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
bin_PROGRAMS = make_quick_mosaic

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
$(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

Expand Down
1 change: 1 addition & 0 deletions tools/make_quick_mosaic/make_quick_mosaic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "read_mosaic.h"
#include "mosaic_util.h"
#include "create_xgrid.h"
#include "create_xgrid_util.h"
#define AREA_RATIO_THRESH (1.e-6)
#define AREA_RATIO_THRESH2 (1.e-4)

Expand Down
2 changes: 1 addition & 1 deletion tools/make_topog/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if WITH_MPI
endif

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
$(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_topog_SOURCES = make_topog.c \
Expand Down
Loading
Loading