Attempting to implement Stephan's suggestions.

Author: jrper

assemble/Construct_Momentum_Element_DG.F90

@@ -1,14 +1,4 @@
 #include "fdebug.h"  
-#undef ASSERT
-#ifdef NDEBUG
-#define ASSERT(X)
-#else
-#ifdef FORTRAN_DISALLOWS_LONG_LINES
-#define ASSERT(X) IF(.NOT.(X)) FLAbort("Failed assertion ")
-#else
-#define ASSERT(X) IF(.NOT.(X)) FLAbort("Failed assertion X")
-#endif
-#endif
 
 module momentum_element_dg
 

assemble/Construct_Momentum_Element_DG_template.F90

@@ -212,11 +212,6 @@ subroutine WRAP_NAME(construct_momentum_element_dg)(ele, big_m, rhs, &
 
     dg=continuity(U)<0
     p0=(element_degree(u,ele)==0)
-
-!    print*, "start"
-!    print*, NDIM(U), NLOC_X ,NLOC(U,ele),&
-!         NGI(U,ele), FNGI(U_nl,face), EFLOC(U,ele), FLOC(u,face), P_FLOC
-
 
     ! In parallel, we construct terms on elements we own and those in
     ! the L1 element halo.

assemble/Makefile.in

@@ -35,6 +35,7 @@ FCFLAGS = -I../include @MOD_FLAG@../include @CPPFLAGS@ @FCFLAGS@ -I/usr/local/in
 MPIF90  = @MPIF90@
 
 CPP     = @CPP@ 
+CPP_FORTRAN = @CPP_FORTRAN@
 
 CC      = @CC@
 CFLAGS  = @CPPFLAGS@ @CFLAGS@ -I../include -I/usr/local/include -g
@@ -102,10 +103,14 @@ default: $(LIB)
 %.o: %.mod
 
 clean:
-	rm -f *.o *.d *.mod
+	rm -f *.o *.d *.mod Construct_Momentum_Element_DG_processed.F90
 
 Construct_Momentum_Element_DG_processed.F90:Construct_Momentum_Element_DG.F90 Construct_Momentum_Element_DG_template.F90
-	$(CPP) -x c $(CFLAGS) $(GENFLAGS) Construct_Momentum_Element_DG.F90 -o Construct_Momentum_Element_DG_processed.F90
+ifeq ("@CPP_FORTRAN@","fpp")
+	$(CPP_FORTRAN) -P -C $(CFLAGS) $(GENFLAGS) Construct_Momentum_Element_DG.F90 Construct_Momentum_Element_DG_processed.F90
+else
+	$(CPP_FORTRAN) -P -C -std=c99 -x c  $(CFLAGS) $(GENFLAGS) Construct_Momentum_Element_DG.F90 -o Construct_Momentum_Element_DG_processed.F90
+endif
 
 Construct_Momentum_Element_DG_processed.o: Construct_Momentum_Element_DG_processed.F90
 	@echo "        FC Construct_Momentum_Element_DG"

configure

@@ -621,6 +621,7 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SED
+CPP_FORTRAN
 HYPERLIGHT
 MEMORY_STATS
 MBA3D
@@ -15951,6 +15952,18 @@ fi
 
 #*******************
 
+#***** CPP_FORTAN_FLAGS *********
+# Sets flags passed when calling the C preprocessor on Fortran
+
+if test "x$USING_GFORTRAN" = "xyes"; then
+   CPP_FORTRAN="$CPP"
+else
+# Assume we're using the intel Fortran preprocessor.
+   CPP_FORTRAN="fpp"
+fi
+#********************************
+
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }

configure.in

@@ -1724,6 +1724,18 @@ fi
 
 #*******************
 
+#***** CPP_FORTAN_FLAGS *********
+# Sets flags passed when calling the C preprocessor on Fortran
+
+if test "x$USING_GFORTRAN" = "xyes"; then
+   CPP_FORTRAN="$CPP"
+else
+# Assume we're using the intel Fortran preprocessor.
+   CPP_FORTRAN="fpp"
+fi
+#********************************
+
+AC_SUBST(CPP_FORTRAN)
 
 AC_PROG_SED
 AC_PROG_GREP