Moved declaration of gaussaw() to cdi.h

src/Makefile.am

@@ -63,7 +63,6 @@ libcdi_la_SOURCES = 	 \
 	file.c         	 \
 	file.h	 	 \
 	gaussgrid.c      \
-	gaussgrid.h	 \
 	gribapi.c  	 \
 	gribapi.h	 \
 	gribapi_utilities.h \

src/cdi.h

@@ -15,7 +15,6 @@
 extern "C" {
 #endif
 
-
 #define  CDI_MAX_NAME             256   // max length of a name
 
 #define  CDI_UNDEFID               -1
@@ -1283,8 +1282,9 @@ int     vlistInqVarSubtype(int vlistID, int varID);
 
 void gribapiLibraryVersion(int *major_version, int *minor_version, int *revision_version);
 
+void gaussaw(double *pa, double *pw, size_t nlat);
 
-#if defined (__cplusplus)
+#ifdef __cplusplus
 }
 #endif
 

src/gaussgrid.c

@@ -11,7 +11,6 @@
 #endif
 
 #include "dmemory.h"
-#include "gaussgrid.h"
 #include "cdi_int.h"
 
 
@@ -136,10 +135,7 @@ void gauaw(size_t kn, double *restrict pl, double *restrict pw)
       ik++;
     }
 
-  /*
-   * 2.1 Find first approximation of the roots of the
-   *     Legendre polynomial of degree kn.
-   */
+  /* 2.1 Find first approximation of the roots of the Legendre polynomial of degree kn */
 
   size_t ins2 = kn/2+(kn % 2);
   double z;
@@ -180,7 +176,7 @@ void gauaw(size_t kn, double *restrict pl, double *restrict pw)
 }
 
 
-void gaussaw(double *restrict pa, double *restrict pw, size_t nlat)
+void gaussaw(double *pa, double *pw, size_t nlat)
 {
   //gauaw_old(pa, pw, nlat);
   gauaw(nlat, pa, pw);

src/gaussgrid.h

-#ifndef _GAUSSGRID_H
-#define _GAUSSGRID_H
-
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void gaussaw(double *restrict pa, double *restrict pw, size_t nlat);
-bool isGaussGrid(size_t ysize, double yinc, const double *yvals);
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif  /* _GAUSSGRID_H */
-/*
- * Local Variables:
- * c-file-style: "Java"
- * c-basic-offset: 2
- * indent-tabs-mode: nil
- * show-trailing-whitespace: t
- * require-trailing-newline: t
- * End:
- */

src/grid.c

@@ -11,7 +11,6 @@
 #include "cdi_int.h"
 #include "cdi_uuid.h"
 #include "grid.h"
-#include "gaussgrid.h"
 #include "resource_handle.h"
 #include "resource_unpack.h"
 #include "namespace.h"

src/grid.h

@@ -169,6 +169,8 @@ int gridVerifyGribParamLCC(double missval, double *lon_0, double *lat_0, double
 int gridVerifyGribParamSTERE(double missval, double *lon_0, double *lat_ts, double *lat_0,
                              double *a, double *xval_0, double *yval_0, double *x_0, double *y_0);
 
+bool isGaussGrid(size_t ysize, double yinc, const double *yvals);
+
 #endif
 /*
  * Local Variables:

src/stream_cdf_i.c

@@ -8,7 +8,6 @@
 #include <limits.h>
 
 #include "dmemory.h"
-#include "gaussgrid.h"
 #include "cdi_int.h"
 #include "cdi_uuid.h"
 #include "stream_cdf.h"