<p><b>mmwolf@sandia.gov</b> 2010-01-05 17:17:15 -0700 (Tue, 05 Jan 2010)</p><p>Michael Duda's changes to clean up Makefiles. I verified they work with Zoltan<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/swmodel/Makefile
===================================================================
--- trunk/swmodel/Makefile 2010-01-06 00:08:02 UTC (rev 104)
+++ trunk/swmodel/Makefile 2010-01-06 00:17:15 UTC (rev 105)
@@ -1,113 +1,113 @@
-#MODEL_FORMULATION = -DNCAR_FORMULATION
-MODEL_FORMULATION = -DLANL_FORMULATION
-
-#EXPAND_LEVELS = -DEXPAND_LEVELS=32
-#FILE_OFFSET = -DOFFSET64BIT
-
-#########################
-# Section for Zoltan TPL
-#########################
-ifdef ZOLTAN_HOME
- ZOLTAN_DEFINE = -DHAVE_ZOLTAN
-endif
-#########################
-
-dummy:
- @( echo "try one of:"; \
- echo " make xlf"; \
- echo " make pgi"; \
- echo " make ifort"; \
- echo " make gfortran"; \
- )
-
-xlf:
- ( make all \
- "FC = mpxlf90" \
- "CC = mpcc" \
- "SFC = xlf90" \
- "SCC = xlc" \
- "FFLAGS = -qrealsize=8 -g -C $(ZOLTAN_DEFINE)" \
- "CFLAGS = -g $(ZOLTAN_DEFINE)" \
- "LDFLAGS = -g -C" \
- "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
-
-pgi:
- ( make all \
- "FC = mpif90" \
- "CC = mpicc" \
- "SFC = pgf90" \
- "SCC = pgcc" \
- "FFLAGS = -r8 -O3" \
- "CFLAGS = -O3 $(ZOLTAN_DEFINE)" \
- "LDFLAGS = -O3 $(ZOLTAN_DEFINE)" \
- "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
-
-ifort:
- ( make all \
- "FC = mpif90" \
- "CC = gcc" \
- "SFC = ifort" \
- "SCC = gcc" \
- "FFLAGS = -real-size 64 -O3" \
- "CFLAGS = -O3 -m64 $(ZOLTAN_DEFINE)" \
- "LDFLAGS = -O3 $(ZOLTAN_DEFINE)" \
- "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
-
-gfortran:
- ( make all \
- "FC = mpif90" \
- "CC = mpicc" \
- "SFC = gfortran" \
- "SCC = gcc" \
- "FFLAGS = -O3 -m64 -ffree-line-length-none $(ZOLTAN_DEFINE)" \
- "CFLAGS = -O3 -m64 $(ZOLTAN_DEFINE)" \
- "LDFLAGS = -O3 -m64" \
- "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
-
-
-
-CPPINCLUDES = -I../inc -I$(NETCDF)/include
-FCINCLUDES = -I../inc -I$(NETCDF)/include
-LIBS = -L$(NETCDF)/lib -lnetcdf
-
-RM = rm -f
-CPP = cpp -C -P -traditional
-RANLIB = ranlib
-
-#########################
-# Section for Zoltan TPL
-#########################
-ifdef ZOLTAN_HOME
- ifdef ZOLTAN_INC_PATH
- FCINCLUDES += -I$(ZOLTAN_INC_PATH)
- else
- FCINCLUDES += -I$(ZOLTAN_HOME)/include
- endif
-
- ifdef ZOLTAN_LIB_PATH
- LIBS += -L$(ZOLTAN_LIB_PATH) -lzoltan
- else
- LIBS += -L$(ZOLTAN_HOME)/lib -lzoltan
- endif
-endif
-#########################
-
-all: reg_includes externals swmodel_main
-
-reg_includes:
- cd Registry; make CC="$(SCC)"
- cd Registry; ./parse Registry; mv *.inc ../inc
-
-externals:
- cd external; make FC="$(FC)" SFC="$(SFC)" CC="$(CC)" SCC="$(SCC)" FFLAGS="$(FFLAGS)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" RANLIB="$(RANLIB)" NETCDF="$(NETCDF)"
-
-swmodel_main:
- cd src; make FC="$(FC)" CC="$(CC)" CFLAGS="$(CFLAGS)" FFLAGS="$(FFLAGS)" LDFLAGS="$(LDFLAGS)" RM="$(RM)" CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LIBS="$(LIBS)" CPPINCLUDES="$(CPPINCLUDES)" FCINCLUDES="$(FCINCLUDES)"
- if [ ! -e swmodel ]; then ln -s src/swmodel .; fi
-
-clean:
- cd Registry; make clean
- cd external; make clean
- cd src; make clean RM="$(RM)"
- $(RM) inc/*.inc
- $(RM) swmodel
+#MODEL_FORMULATION = -DNCAR_FORMULATION
+MODEL_FORMULATION = -DLANL_FORMULATION
+
+#EXPAND_LEVELS = -DEXPAND_LEVELS=32
+#FILE_OFFSET = -DOFFSET64BIT
+
+#########################
+# Section for Zoltan TPL
+#########################
+ifdef ZOLTAN_HOME
+ ZOLTAN_DEFINE = -DHAVE_ZOLTAN
+endif
+#########################
+
+dummy:
+ @( echo "try one of:"; \
+ echo " make xlf"; \
+ echo " make pgi"; \
+ echo " make ifort"; \
+ echo " make gfortran"; \
+ )
+
+xlf:
+ ( make all \
+ "FC = mpxlf90" \
+ "CC = mpcc" \
+ "SFC = xlf90" \
+ "SCC = xlc" \
+ "FFLAGS = -qrealsize=8 -g -C " \
+ "CFLAGS = -g" \
+ "LDFLAGS = -g -C" \
+ "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+
+pgi:
+ ( make all \
+ "FC = mpif90" \
+ "CC = mpicc" \
+ "SFC = pgf90" \
+ "SCC = pgcc" \
+ "FFLAGS = -r8 -O3" \
+ "CFLAGS = -O3" \
+ "LDFLAGS = -O3" \
+ "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+
+ifort:
+ ( make all \
+ "FC = mpif90" \
+ "CC = gcc" \
+ "SFC = ifort" \
+ "SCC = gcc" \
+ "FFLAGS = -real-size 64 -O3" \
+ "CFLAGS = -O3 -m64" \
+ "LDFLAGS = -O3" \
+ "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+
+gfortran:
+ ( make all \
+ "FC = mpif90" \
+ "CC = mpicc" \
+ "SFC = gfortran" \
+ "SCC = gcc" \
+ "FFLAGS = -O3 -m64 -ffree-line-length-none" \
+ "CFLAGS = -O3 -m64" \
+ "LDFLAGS = -O3 -m64" \
+ "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+
+
+
+CPPINCLUDES = -I../inc -I$(NETCDF)/include
+FCINCLUDES = -I../inc -I$(NETCDF)/include
+LIBS = -L$(NETCDF)/lib -lnetcdf
+
+RM = rm -f
+CPP = cpp -C -P -traditional
+RANLIB = ranlib
+
+#########################
+# Section for Zoltan TPL
+#########################
+ifdef ZOLTAN_HOME
+ ifdef ZOLTAN_INC_PATH
+ FCINCLUDES += -I$(ZOLTAN_INC_PATH)
+ else
+ FCINCLUDES += -I$(ZOLTAN_HOME)/include
+ endif
+
+ ifdef ZOLTAN_LIB_PATH
+ LIBS += -L$(ZOLTAN_LIB_PATH) -lzoltan
+ else
+ LIBS += -L$(ZOLTAN_HOME)/lib -lzoltan
+ endif
+endif
+#########################
+
+all: reg_includes externals swmodel_main
+
+reg_includes:
+ cd Registry; make CC="$(SCC)"
+ cd Registry; ./parse Registry; mv *.inc ../inc
+
+externals:
+ cd external; make FC="$(FC)" SFC="$(SFC)" CC="$(CC)" SCC="$(SCC)" FFLAGS="$(FFLAGS)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" RANLIB="$(RANLIB)" NETCDF="$(NETCDF)"
+
+swmodel_main:
+ cd src; make FC="$(FC)" CC="$(CC)" CFLAGS="$(CFLAGS)" FFLAGS="$(FFLAGS)" LDFLAGS="$(LDFLAGS)" RM="$(RM)" CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LIBS="$(LIBS)" CPPINCLUDES="$(CPPINCLUDES)" FCINCLUDES="$(FCINCLUDES)"
+ if [ ! -e swmodel ]; then ln -s src/swmodel .; fi
+
+clean:
+ cd Registry; make clean
+ cd external; make clean
+ cd src; make clean RM="$(RM)"
+ $(RM) inc/*.inc
+ $(RM) swmodel
Modified: trunk/swmodel/src/Makefile
===================================================================
--- trunk/swmodel/src/Makefile 2010-01-06 00:08:02 UTC (rev 104)
+++ trunk/swmodel/src/Makefile 2010-01-06 00:17:15 UTC (rev 105)
@@ -1,60 +1,60 @@
-.SUFFIXES: .F .c .o
-
-ifdef ZOLTAN_HOME
- ZOLTANOBJ = module_zoltan_interface.o
-endif
-
-
-OBJS = swmodel.o \
- module_timer.o \
- module_configure.o \
- module_constants.o \
- module_test_cases.o \
- module_sw_solver.o \
- module_grid_types.o \
- module_hash.o \
- module_sort.o \
- module_block_decomp.o \
- module_dmpar.o \
- module_io_input.o \
- module_io_output.o \
- module_time_integration.o \
- $(ZOLTANOBJ) \
- streams.o
-
-all: swmodel
-
-swmodel.o: module_configure.o module_dmpar.o module_grid_types.o module_test_cases.o module_io_input.o module_sw_solver.o module_timer.o $(ZOLTANOBJ)
-
-module_configure.o: module_dmpar.o
-
-module_grid_types.o: module_dmpar.o
-
-module_dmpar.o: module_sort.o streams.o
-
-module_block_decomp.o: module_grid_types.o module_hash.o
-
-module_io_input.o: module_grid_types.o module_dmpar.o module_block_decomp.o module_sort.o module_configure.o $(ZOLTANOBJ)
-
-module_io_output.o: module_grid_types.o module_dmpar.o module_sort.o module_configure.o
-
-module_sw_solver.o: module_configure.o module_grid_types.o module_io_output.o module_time_integration.o module_dmpar.o module_timer.o
-
-module_time_integration.o: module_grid_types.o module_configure.o module_dmpar.o
-
-module_test_cases.o: module_grid_types.o module_configure.o module_constants.o module_dmpar.o
-
-swmodel: $(OBJS)
- $(FC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-clean:
- $(RM) *.o *.mod swmodel
-
-.F.o:
- $(RM) $@ $*.mod
- $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES)
- $(RM) $*.f90
-
-.c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPINCLUDES) -c $<
+.SUFFIXES: .F .c .o
+
+ifdef ZOLTAN_HOME
+ ZOLTANOBJ = module_zoltan_interface.o
+endif
+
+
+OBJS = swmodel.o \
+ module_timer.o \
+ module_configure.o \
+ module_constants.o \
+ module_test_cases.o \
+ module_sw_solver.o \
+ module_grid_types.o \
+ module_hash.o \
+ module_sort.o \
+ module_block_decomp.o \
+ module_dmpar.o \
+ module_io_input.o \
+ module_io_output.o \
+ module_time_integration.o \
+ $(ZOLTANOBJ) \
+ streams.o
+
+all: swmodel
+
+swmodel.o: module_configure.o module_dmpar.o module_grid_types.o module_test_cases.o module_io_input.o module_sw_solver.o module_timer.o
+
+module_configure.o: module_dmpar.o
+
+module_grid_types.o: module_dmpar.o
+
+module_dmpar.o: module_sort.o streams.o
+
+module_block_decomp.o: module_grid_types.o module_hash.o
+
+module_io_input.o: module_grid_types.o module_dmpar.o module_block_decomp.o module_sort.o module_configure.o $(ZOLTANOBJ)
+
+module_io_output.o: module_grid_types.o module_dmpar.o module_sort.o module_configure.o
+
+module_sw_solver.o: module_configure.o module_grid_types.o module_io_output.o module_time_integration.o module_dmpar.o module_timer.o
+
+module_time_integration.o: module_grid_types.o module_configure.o module_dmpar.o
+
+module_test_cases.o: module_grid_types.o module_configure.o module_constants.o module_dmpar.o
+
+swmodel: $(OBJS)
+ $(FC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+clean:
+ $(RM) *.o *.mod swmodel
+
+.F.o:
+ $(RM) $@ $*.mod
+ $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
+ $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES)
+ $(RM) $*.f90
+
+.c.o:
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPINCLUDES) -c $<
</font>
</pre>