[cig-commits] commit: Add a simple waf script and remove the Makefile
Mercurial
hg at geodynamics.org
Sun Mar 6 00:03:49 PST 2011
changeset: 108:bb0d3477e3a5
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Sat Mar 05 23:47:30 2011 -0800
files: Makefile waf-1.6.3 wscript
description:
Add a simple waf script and remove the Makefile
diff -r 13edbdcc4486 -r bb0d3477e3a5 Makefile
--- a/Makefile Sat Mar 05 23:46:21 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-#########################################################################
-##
-## This file is part of the SAMRAI distribution. For full copyright
-## information, see COPYRIGHT and COPYING.LESSER.
-##
-## Copyright: (c) 1997-2010 Lawrence Livermore National Security, LLC
-## Description: makefile for SAMRAI FAC Stokes
-##
-#########################################################################
-
-SAMRAI = ../SAMRAI-hg
-SRCDIR = .
-VPATH =
-TESTTOOLS = ../testtools
-OBJECT = ../SAMRAI-hg-build
-
-default: main
-
-include $(OBJECT)/config/Makefile.config
-
-CPPFLAGS_EXTRA= -DTESTING=0
-
-NUM_TESTS = 2
-
-TEST_NPROCS = 0,2
-
-CXX_OBJS = main.o FACStokes/FACStokes.o \
- FACStokes/initializeLevelData.o \
- FACStokes/packDerivedDataIntoDoubleBuffer.o \
- FACStokes/resetHierarchyConfiguration.o \
- FACStokes/setupPlotter.o \
- FACStokes/solveStokes.o \
- P_Refine.o V_Refine.o V_Coarsen.o \
- P_Boundary_Refine.o \
- V_Boundary_Refine/refine.o \
- V_Boundary_Refine/Update_V.o \
- P_Refine_Patch_Strategy.o \
- V_Refine_Patch_Strategy.o \
- V_Coarsen_Patch_Strategy.o \
- Cell_Viscosity_Coarsen.o \
- Edge_Viscosity_Coarsen.o \
- set_V_boundary.o \
- StokesFACOps/StokesFACOps.o \
- StokesFACOps/checkInputPatchDataIndices.o \
- StokesFACOps/computeCompositeResidualOnLevel.o \
- StokesFACOps/computeFluxOnPatch.o \
- StokesFACOps/computeResidualNorm.o \
- StokesFACOps/computeVectorWeights.o \
- StokesFACOps/deallocateOperatorState.o \
- StokesFACOps/ewingFixFlux.o \
- StokesFACOps/finalizeCallback.o \
- StokesFACOps/initializeOperatorState.o \
- StokesFACOps/postprocessOneCycle.o \
- StokesFACOps/prolongErrorAndCorrect.o \
- StokesFACOps/restrictResidual.o \
- StokesFACOps/restrictSolution.o \
- StokesFACOps/smoothError.o \
- StokesFACOps/smooth_Tackley.o \
- StokesFACOps/smooth_Gerya.o \
- StokesFACOps/set_boundaries.o \
- StokesFACOps/solveCoarsestLevel.o \
- StokesFACOps/solveCoarsestLevel_HYPRE.o \
- StokesFACOps/Update_V.o \
- StokesFACOps/xeqScheduleFluxCoarsen.o \
- StokesFACOps/xeqScheduleGhostFill.o \
- StokesFACOps/xeqScheduleGhostFillNoCoarse.o \
- StokesFACOps/xeqScheduleProlongation.o \
- StokesFACOps/xeqScheduleRRestriction.o \
- StokesFACOps/xeqScheduleURestriction.o \
- StokesFACSolver/StokesFACSolver.o \
- StokesFACSolver/StokesFACSolver_Destructor.o \
- StokesFACSolver/createVectorWrappers.o \
- StokesFACSolver/deallocateSolverState.o \
- StokesFACSolver/destroyVectorWrappers.o \
- StokesFACSolver/enableLogging.o \
- StokesFACSolver/getFromInput.o \
- StokesFACSolver/initializeSolverState.o \
- StokesFACSolver/initializeStatics.o \
- StokesFACSolver/setBcObject.o \
- StokesFACSolver/setBoundaries.o \
- StokesFACSolver/solveSystem.o \
- StokesHypreSolver.o StokesSpecifications.o
-
-main: $(CXX_OBJS) $(LIBSAMRAIDEPEND)
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(CXX_OBJS) \
- $(LIBSAMRAI3D) $(LIBSAMRAI3D) $(LIBSAMRAI) $(LDLIBS) -o main
-
-check:
- $(MAKE) check2d
- $(MAKE) check3d
-
-check2d: main
- @for i in test_inputs/*2d.input ; do \
- $(OBJECT)/config/serpa-run $(TEST_NPROCS) \
- ./main $${i}; \
- done
-
-check3d: main
- @for i in test_inputs/*3d.input ; do \
- $(OBJECT)/config/serpa-run $(TEST_NPROCS) \
- ./main $${i}; \
- done
-
-checkcompile: main
-
-checktest:
- rm -f makecheck.logfile
- $(MAKE) check 2>&1 | $(TEE) makecheck.logfile
- $(TESTTOOLS)/testcount.sh $(TEST_NPROCS) $(NUM_TESTS) makecheck.logfile
- rm -f makecheck.logfile
-
-examples2d: main
- @for i in $(SRCDIR)/example_inputs/*.2d.input ; do \
- $(OBJECT)/config/serpa-run $(TEST_NPROCS) \
- ./main $${i}; \
- done
-
-examples3d: main
- @for i in $(SRCDIR)/example_inputs/*.3d.input ; do \
- $(OBJECT)/config/serpa-run $(TEST_NPROCS) \
- ./main $${i}; \
- done
-
-examples:
- $(MAKE) examples2d
- $(MAKE) examples3d
-
-clean-check:
- $(SAMCLEAN)
-
-clean: clean-check
- $(RM) main *.f *.o */*.o
-
-redo:
- $(RM) core main
-
-include $(SRCDIR)/Makefile.depend
-
diff -r 13edbdcc4486 -r bb0d3477e3a5 waf-1.6.3
Binary file waf-1.6.3 has changed
diff -r 13edbdcc4486 -r bb0d3477e3a5 wscript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wscript Sat Mar 05 23:47:30 2011 -0800
@@ -0,0 +1,101 @@
+# top = '.'
+# out = 'build'
+
+def options(opt):
+ opt.load('compiler_cxx')
+
+def configure(conf):
+ conf.load('compiler_cxx')
+def build(bld):
+ # bld.recurse('src/libtcod-1.5.0')
+ bld.program(
+ features = ['cxx','cprogram'],
+ source = ['main.C',
+ 'FACStokes/FACStokes.C',
+ 'FACStokes/initializeLevelData.C',
+ 'FACStokes/packDerivedDataIntoDoubleBuffer.C',
+ 'FACStokes/resetHierarchyConfiguration.C',
+ 'FACStokes/setupPlotter.C',
+ 'FACStokes/solveStokes.C',
+ 'P_Refine.C',
+ 'V_Refine.C',
+ 'V_Coarsen.C',
+ 'P_Boundary_Refine.C',
+ 'V_Boundary_Refine/refine.C',
+ 'V_Boundary_Refine/Update_V.C',
+ 'P_Refine_Patch_Strategy.C',
+ 'V_Refine_Patch_Strategy.C',
+ 'V_Coarsen_Patch_Strategy.C',
+ 'Cell_Viscosity_Coarsen.C',
+ 'Edge_Viscosity_Coarsen.C',
+ 'set_V_boundary.C',
+ 'StokesFACOps/StokesFACOps.C',
+ 'StokesFACOps/checkInputPatchDataIndices.C',
+ 'StokesFACOps/computeCompositeResidualOnLevel.C',
+ 'StokesFACOps/computeFluxOnPatch.C',
+ 'StokesFACOps/computeResidualNorm.C',
+ 'StokesFACOps/computeVectorWeights.C',
+ 'StokesFACOps/deallocateOperatorState.C',
+ 'StokesFACOps/ewingFixFlux.C',
+ 'StokesFACOps/finalizeCallback.C',
+ 'StokesFACOps/initializeOperatorState.C',
+ 'StokesFACOps/postprocessOneCycle.C',
+ 'StokesFACOps/prolongErrorAndCorrect.C',
+ 'StokesFACOps/restrictResidual.C',
+ 'StokesFACOps/restrictSolution.C',
+ 'StokesFACOps/smoothError.C',
+ 'StokesFACOps/smooth_Tackley.C',
+ 'StokesFACOps/smooth_Gerya.C',
+ 'StokesFACOps/set_boundaries.C',
+ 'StokesFACOps/solveCoarsestLevel.C',
+ 'StokesFACOps/solveCoarsestLevel_HYPRE.C',
+ 'StokesFACOps/Update_V.C',
+ 'StokesFACOps/xeqScheduleFluxCoarsen.C',
+ 'StokesFACOps/xeqScheduleGhostFill.C',
+ 'StokesFACOps/xeqScheduleGhostFillNoCoarse.C',
+ 'StokesFACOps/xeqScheduleProlongation.C',
+ 'StokesFACOps/xeqScheduleRRestriction.C',
+ 'StokesFACOps/xeqScheduleURestriction.C',
+ 'StokesFACSolver/StokesFACSolver.C',
+ 'StokesFACSolver/StokesFACSolver_Destructor.C',
+ 'StokesFACSolver/createVectorWrappers.C',
+ 'StokesFACSolver/deallocateSolverState.C',
+ 'StokesFACSolver/destroyVectorWrappers.C',
+ 'StokesFACSolver/enableLogging.C',
+ 'StokesFACSolver/getFromInput.C',
+ 'StokesFACSolver/initializeSolverState.C',
+ 'StokesFACSolver/initializeStatics.C',
+ 'StokesFACSolver/setBcObject.C',
+ 'StokesFACSolver/setBoundaries.C',
+ 'StokesFACSolver/solveSystem.C',
+ 'StokesHypreSolver.C',
+ 'StokesSpecifications.C'],
+
+ target = 'gamr',
+ # cxxflags = ['-std=c++0x','-g','-D_GLIBCXX_DEBUG'],
+ cxxflags = ['-g', '-Wall', '-Wextra', '-Wconversion',
+ '-DTESTING=0'],
+ lib = ['SAMRAI_appu', 'SAMRAI_algs', 'SAMRAI_solv',
+ 'SAMRAI_geom', 'SAMRAI_mesh', 'SAMRAI_math',
+ 'SAMRAI_pdat', 'SAMRAI_xfer', 'SAMRAI_hier',
+ 'SAMRAI_tbox', 'petsc', 'HYPRE',
+ 'HYPRE_sstruct_ls', 'HYPRE_sstruct_mv',
+ 'HYPRE_struct_ls', 'HYPRE_struct_mv',
+ 'HYPRE_parcsr_ls',
+ 'HYPRE_DistributedMatrixPilutSolver',
+ 'HYPRE_ParaSails', 'HYPRE_Euclid',
+ 'HYPRE_MatrixMatrix', 'HYPRE_DistributedMatrix',
+ 'HYPRE_IJ_mv', 'HYPRE_parcsr_mv', 'HYPRE_seq_mv',
+ 'HYPRE_krylov', 'HYPRE_utilities', 'hdf5',
+ 'dl', 'm', 'gfortranbegin', 'gfortran', 'm',
+ 'gfortranbegin', 'gfortran', 'm', 'gfortranbegin',
+ 'gfortran', 'm', 'sundials_cvode', 'sundials_kinsol'],
+ libpath = ['../../SAMRAI-hg-build/lib',
+ '/usr/lib/petsc/linux-gnu-c-opt/lib'],
+ includes = ['.','../SAMRAI-hg-build/include',
+ '../SAMRAI-hg/source',
+ '/usr/lib/petsc/include',
+ '/usr/lib/petsc/bmake/linux-gnu-c-opt',
+ '/usr/lib/petsc/src/vec',
+ '/usr/include']
+ )
More information about the CIG-COMMITS
mailing list