Remove PRIVATE and PUBLIC macros.

Change indentation.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Cartoon2D/trunk@83 eec4d7dc-71c2-46d6-addf-10296150bf52

1 files changed, 45 insertions, 65 deletions

diff --git a/src/interpolate.c b/src/interpolate.c
index 0545944..be19d6c 100644
--- a/src/interpolate.c
+++ b/src/interpolate.c
@@ -16,10 +16,8 @@
 */
 
 #include <math.h>
-#include "cctk.h"
 
-#define PRIVATE static
-#define PUBLIC 
+#include "cctk.h"
 
 CCTK_REAL interpolate_local(int order, CCTK_REAL x0, CCTK_REAL dx, 
                             CCTK_REAL y[],
@@ -30,21 +28,21 @@ CCTK_REAL interpolate_eno(CCTK_REAL x0, CCTK_REAL dx,
                           CCTK_REAL x);
 
 /* prototypes for private functions defined in this file */
-PRIVATE CCTK_REAL interpolate_local_order1(CCTK_REAL x0, CCTK_REAL dx,
-					   CCTK_REAL y[],
-					   CCTK_REAL x);
-PRIVATE CCTK_REAL interpolate_local_order2(CCTK_REAL x0, CCTK_REAL dx,
-					   CCTK_REAL y[],
-					   CCTK_REAL x);
-PRIVATE CCTK_REAL interpolate_local_order3(CCTK_REAL x0, CCTK_REAL dx,
-					   CCTK_REAL y[],
-					   CCTK_REAL x);
-PRIVATE CCTK_REAL interpolate_local_order4(CCTK_REAL x0, CCTK_REAL dx,
-					   CCTK_REAL y[],
-					   CCTK_REAL x);
-PRIVATE CCTK_REAL interpolate_local_order5(CCTK_REAL x0, CCTK_REAL dx,
-					   CCTK_REAL y[],
-					   CCTK_REAL x);
+static CCTK_REAL interpolate_local_order1(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x);
+static CCTK_REAL interpolate_local_order2(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x);
+static CCTK_REAL interpolate_local_order3(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x);
+static CCTK_REAL interpolate_local_order4(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x);
+static CCTK_REAL interpolate_local_order5(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x);
 
 /*****************************************************************************/
 
@@ -72,37 +70,19 @@ PRIVATE CCTK_REAL interpolate_local_order5(CCTK_REAL x0, CCTK_REAL dx,
  * y[0...order] = (in) The y data array.
  * x = (in) The x coordinate for the interpolation.
  */
-PUBLIC CCTK_REAL interpolate_local(int order,
-				CCTK_REAL x0, CCTK_REAL dx,
-				CCTK_REAL y[],
-				CCTK_REAL x)
+CCTK_REAL interpolate_local(int order,
+                            CCTK_REAL x0, CCTK_REAL dx,
+                            CCTK_REAL y[],
+                            CCTK_REAL x)
 {
-switch	(order)
-	{
-case 1:
-	return(  interpolate_local_order1(x0, dx, y, x)  );
-	break;
-
-case 2:
-	return(  interpolate_local_order2(x0, dx, y, x)  );
-	break;
-
-case 3:
-	return(  interpolate_local_order3(x0, dx, y, x)  );
-	break;
-
-case 4:
-	return(  interpolate_local_order4(x0, dx, y, x)  );
-	break;
-
-case 5:
-	return(  interpolate_local_order5(x0, dx, y, x)  );
-	break;
-
-default:
-        CCTK_WARN(0, "Interpolation order not supported");
-        return(0);
-	}
+  switch (order) {
+  case 1: return interpolate_local_order1(x0, dx, y, x);
+  case 2: return interpolate_local_order2(x0, dx, y, x);
+  case 3: return interpolate_local_order3(x0, dx, y, x);
+  case 4: return interpolate_local_order4(x0, dx, y, x);
+  case 5: return interpolate_local_order5(x0, dx, y, x);
+  default: CCTK_WARN(0, "Interpolation order not supported");
+  }
 }
 
 /*****************************************************************************/
@@ -111,9 +91,9 @@ default:
  * This function interpolates a 1st-order (linear) Lagrange polynomial
  * in a 2-point [0...1] data array centered about the [0.5] grid position.
  */
-PRIVATE CCTK_REAL interpolate_local_order1(CCTK_REAL x0, CCTK_REAL dx,
-					CCTK_REAL y[],
-					CCTK_REAL x)
+static CCTK_REAL interpolate_local_order1(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x)
 {
 CCTK_REAL c0 = (+1.0/2.0)*y[0] + (+1.0/2.0)*y[1];
 CCTK_REAL c1 =          - y[0] +          + y[1];
@@ -130,9 +110,9 @@ return(  c0 + xr*c1  );
  * This function interpolates a 2nd-order (quadratic) Lagrange polynomial
  * in a 3-point [0...2] data array centered about the [1] grid position.
  */
-PRIVATE CCTK_REAL interpolate_local_order2(CCTK_REAL x0, CCTK_REAL dx,
-					CCTK_REAL y[],
-					CCTK_REAL x)
+static CCTK_REAL interpolate_local_order2(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x)
 {
 CCTK_REAL c0 = y[1];
 CCTK_REAL c1 = (-1.0/2.0)*y[0]        + (+1.0/2.0)*y[2];
@@ -150,9 +130,9 @@ return(  c0 + xr*(c1 + xr*c2)  );
  * This function interpolates a 3rd-order (cubic) Lagrange polynomial
  * in a 4-point [0...3] data array centered about the [1.5] grid position.
  */
-PRIVATE CCTK_REAL interpolate_local_order3(CCTK_REAL x0, CCTK_REAL dx,
-					CCTK_REAL y[],
-					CCTK_REAL x)
+static CCTK_REAL interpolate_local_order3(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x)
 {
 CCTK_REAL c0 =   (-1.0/16.0)*y[0] + (+9.0/16.0)*y[1]
 	    + (+9.0/16.0)*y[2] + (-1.0/16.0)*y[3];
@@ -175,9 +155,9 @@ return(  c0 + xr*(c1 + xr*(c2 + xr*c3))  );
  * This function interpolates a 4th-order (quartic) Lagrange polynomial
  * in a 5-point [0...4] data array centered about the [2] grid position.
  */
-PRIVATE CCTK_REAL interpolate_local_order4(CCTK_REAL x0, CCTK_REAL dx,
-					CCTK_REAL y[],
-					CCTK_REAL x)
+static CCTK_REAL interpolate_local_order4(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x)
 {
 CCTK_REAL c0 = y[2];
 CCTK_REAL c1 =   (+1.0/12.0)*y[0] + (-2.0/ 3.0)*y[1]
@@ -201,9 +181,9 @@ return(  c0 + xr*(c1 + xr*(c2 + xr*(c3 + xr*c4)))  );
  * This function interpolates a 5th-order (quintic) Lagrange polynomial
  * in a 6-point [0...5] data array centered about the [2.5] grid position.
  */
-PRIVATE CCTK_REAL interpolate_local_order5(CCTK_REAL x0, CCTK_REAL dx,
-					CCTK_REAL y[],
-					CCTK_REAL x)
+static CCTK_REAL interpolate_local_order5(CCTK_REAL x0, CCTK_REAL dx,
+                                          CCTK_REAL y[],
+                                          CCTK_REAL x)
 {
 CCTK_REAL c0 =   (+ 3.0/256.0)*y[0] + (-25.0/256.0)*y[1]
 	    + (+75.0/128.0)*y[2] + (+75.0/128.0)*y[3]
@@ -234,8 +214,8 @@ return(  c0 + xr*(c1 + xr*(c2 + xr*(c3 + xr*(c4 + xr*c5))))  );
 /*****************************************************************************/
 
 CCTK_REAL interpolate_eno(CCTK_REAL x0, CCTK_REAL dx,
-					CCTK_REAL y[],
-					CCTK_REAL x)
+                          CCTK_REAL y[],
+                          CCTK_REAL x)
 {
 
   CCTK_REAL diff[4];