<p><b>mmwolf@sandia.gov</b> 2010-01-05 14:48:08 -0700 (Tue, 05 Jan 2010)</p><p>Changes to Makefile so HAVE_ZOLTAN can be defined<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/swmodel/Makefile
===================================================================
--- trunk/swmodel/Makefile        2010-01-05 21:32:08 UTC (rev 101)
+++ trunk/swmodel/Makefile        2010-01-05 21:48:08 UTC (rev 102)
@@ -4,6 +4,14 @@
 #EXPAND_LEVELS = -DEXPAND_LEVELS=32
 #FILE_OFFSET = -DOFFSET64BIT
 
+#########################
+# Section for Zoltan TPL
+#########################
+ifdef ZOLTAN_HOME
+   ZOLTAN_DEFINE = -DHAVE_ZOLTAN
+endif
+#########################
+
 dummy:
         @( echo &quot;try one of:&quot;; \
         echo &quot;   make xlf&quot;; \
@@ -18,10 +26,10 @@
         &quot;CC = mpcc&quot; \
         &quot;SFC = xlf90&quot; \
         &quot;SCC = xlc&quot; \
-        &quot;FFLAGS = -qrealsize=8 -g -C &quot; \
-        &quot;CFLAGS = -g&quot; \
+        &quot;FFLAGS = -qrealsize=8 -g -C $(ZOLTAN_DEFINE)&quot; \
+        &quot;CFLAGS = -g $(ZOLTAN_DEFINE)&quot; \
         &quot;LDFLAGS = -g -C&quot; \
-        &quot;CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI $(FILE_OFFSET)&quot; )
+        &quot;CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI $(FILE_OFFSET) $(ZOLTAN_DEFINE)&quot; )
  
 pgi:
         ( make all \
@@ -30,9 +38,9 @@
         &quot;SFC = pgf90&quot; \
         &quot;SCC = pgcc&quot; \
         &quot;FFLAGS = -r8 -O3&quot; \
-        &quot;CFLAGS = -O3&quot; \
-        &quot;LDFLAGS = -O3&quot; \
-        &quot;CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE $(FILE_OFFSET)&quot; )
+        &quot;CFLAGS = -O3 $(ZOLTAN_DEFINE)&quot; \
+        &quot;LDFLAGS = -O3 $(ZOLTAN_DEFINE)&quot; \
+        &quot;CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE $(FILE_OFFSET) $(ZOLTAN_DEFINE)&quot; )
 
 ifort:
         ( make all \
@@ -41,9 +49,9 @@
         &quot;SFC = ifort&quot; \
         &quot;SCC = gcc&quot; \
         &quot;FFLAGS = -real-size 64 -O3&quot; \
-        &quot;CFLAGS = -O3 -m64&quot; \
-        &quot;LDFLAGS = -O3&quot; \
-        &quot;CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET)&quot; )
+        &quot;CFLAGS = -O3 -m64 $(ZOLTAN_DEFINE)&quot; \
+        &quot;LDFLAGS = -O3 $(ZOLTAN_DEFINE)&quot; \
+        &quot;CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)&quot; )
 
 gfortran:
         ( make all \
@@ -51,10 +59,10 @@
         &quot;CC = mpicc&quot; \
         &quot;SFC = gfortran&quot; \
         &quot;SCC = gcc&quot; \
-        &quot;FFLAGS = -O3 -m64 -ffree-line-length-none&quot; \
-        &quot;CFLAGS = -O3 -m64&quot; \
+        &quot;FFLAGS = -O3 -m64 -ffree-line-length-none $(ZOLTAN_DEFINE)&quot; \
+        &quot;CFLAGS = -O3 -m64 $(ZOLTAN_DEFINE)&quot; \
         &quot;LDFLAGS = -O3 -m64&quot; \
-        &quot;CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET)&quot; )
+        &quot;CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)&quot; )
 
 
 
@@ -70,10 +78,6 @@
 # Section for Zoltan TPL
 #########################
 ifdef ZOLTAN_HOME
-   FFLAGS += -DHAVE_ZOLTAN
-   CFLAGS += -DHAVE_ZOLTAN
-   CPPFLAGS += -DHAVE_ZOLTAN
-
    ifdef ZOLTAN_INC_PATH
       FCINCLUDES += -I$(ZOLTAN_INC_PATH)
    else

</font>
</pre>