? Doof2dGMP.28Sep.10.3.patch
? Doof2dGMP.28Sep.10.3.ChangeLog
Index: Doof2dGMP.cpp
===================================================================
RCS file: Doof2dGMP.cpp
diff -N Doof2dGMP.cpp
*** /tmp/cvsq6Qc5U	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,68 ****
- // -*- C++ -*-
- // ACL:license
- // ----------------------------------------------------------------------
- // This software and ancillary information (herein called "SOFTWARE")
- // called POOMA (Parallel Object-Oriented Methods and Applications) is
- // made available under the terms described here.  The SOFTWARE has been
- // approved for release with associated LA-CC Number LA-CC-98-65.
- // 
- // Unless otherwise indicated, this SOFTWARE has been authored by an
- // employee or employees of the University of California, operator of the
- // Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- // the U.S. Department of Energy.  The U.S. Government has rights to use,
- // reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- // prepare derivative works and publicly display this SOFTWARE without 
- // charge, provided that this Notice and any statement of authorship are 
- // reproduced on all copies.  Neither the Government nor the University 
- // makes any warranty, express or implied, or assumes any liability or 
- // responsibility for the use of this SOFTWARE.
- // 
- // If SOFTWARE is modified to produce derivative works, such modified
- // SOFTWARE should be clearly marked, so as not to confuse it with the
- // version available from LANL.
- // 
- // For more information about POOMA, send e-mail to address@hidden,
- // or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- // ----------------------------------------------------------------------
- // ACL:license
- 
- //-----------------------------------------------------------------------------
- // Doof2d Benchmark (GMP version)
- //-----------------------------------------------------------------------------
- 
- // Include files
- 
- #include "Pooma/Pooma.h"
- #include "Doof2dGMP.h"
- 
- //-----------------------------------------------------------------------------
- // Main program.
- //-----------------------------------------------------------------------------
- 
- int main(int argc, char* argv[])
- {
-   Pooma::initialize(argc, argv); 
-   
-   Benchmark doof2d(argc, argv);
- 
-   cpptran1(doof2d);
-   cpptran2(doof2d);
-   pooma1(doof2d);
-   pooma1c(doof2d);
-   pooma2(doof2d);
-   pooma3(doof2d);
-   
-   doof2d.setSamplingParameters(100,0,1);
-   doof2d.run();
-   
-   Pooma::finalize();
- 
-   return 0;
- }
- 
- // ACL:rcsinfo
- // ----------------------------------------------------------------------
- // $RCSfile: Doof2dGMP.cpp,v $   $Author: julianc $
- // $Revision: 1.3 $   $Date: 2000/04/13 19:56:39 $
- // ----------------------------------------------------------------------
- // ACL:rcsinfo
--- 0 ----
Index: Doof2dGMP.h
===================================================================
RCS file: Doof2dGMP.h
diff -N Doof2dGMP.h
*** /tmp/cvsUgHoIw	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,582 ****
- // -*- C++ -*-
- // ACL:license
- // ----------------------------------------------------------------------
- // This software and ancillary information (herein called "SOFTWARE")
- // called POOMA (Parallel Object-Oriented Methods and Applications) is
- // made available under the terms described here.  The SOFTWARE has been
- // approved for release with associated LA-CC Number LA-CC-98-65.
- // 
- // Unless otherwise indicated, this SOFTWARE has been authored by an
- // employee or employees of the University of California, operator of the
- // Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- // the U.S. Department of Energy.  The U.S. Government has rights to use,
- // reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- // prepare derivative works and publicly display this SOFTWARE without 
- // charge, provided that this Notice and any statement of authorship are 
- // reproduced on all copies.  Neither the Government nor the University 
- // makes any warranty, express or implied, or assumes any liability or 
- // responsibility for the use of this SOFTWARE.
- // 
- // If SOFTWARE is modified to produce derivative works, such modified
- // SOFTWARE should be clearly marked, so as not to confuse it with the
- // version available from LANL.
- // 
- // For more information about POOMA, send e-mail to address@hidden,
- // or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- // ----------------------------------------------------------------------
- // ACL:license
- 
- #ifndef POOMA_BENCHMARKS_DOOF2DGMP_DOOF2DGMP_H
- #define POOMA_BENCHMARKS_DOOF2DGMP_DOOF2DGMP_H
- 
- //-----------------------------------------------------------------------------
- // Classes Doof2dGMPBase, Doof2dGMPCppTran, Doof2dGMPP2.
- //-----------------------------------------------------------------------------
- 
- // Include files
- 
- #include "Pooma/Arrays.h"
- #include "Utilities/Benchmark.h"
- 
- #include <stdlib.h>
- #include <typeinfo>
- #include <iostream>
- 
- //-----------------------------------------------------------------------------
- // Doof2dBase class definitions. We define this as a partially specialized
- // class so it is easy to make subclasses work for GMP or not.
- //-----------------------------------------------------------------------------
- 
- // General version.
- 
- template<class EngineTag, bool GMP>
- class Doof2dBase { };
- 
- // Non-GMP version.
- 
- template<class EngineTag>
- class Doof2dBase<EngineTag, false>
-   : public Implementation
- {
- public:
- 
-   // Dummy constructor.
-   
-   Doof2dBase(int = 1, int = 0) { }
-   
-   // Typedefs for the Array types we'll be using here.
- 
-   typedef Array<2,double,EngineTag> Array2D;
- 
-   // Initialize function gets the size and adjusts the arrays.
-     
-   void initialize(int n) 
-   {
-     // Save the problem size.
-     
-     n_m = n;
- 
-     // Get new array domain.
-     
-     Interval<1> N(1, n_m);
-     Interval<2> newDomain(N, N);
- 
-     // Resize the arrays.
-     
-     a_m.initialize(newDomain);
-     b_m.initialize(newDomain);
- 
-     // Set up domains.
-     
-     I = Interval<1>(2,n_m-1);
-     J = Interval<1>(2,n_m-1);
- 
-     // Intialize Array element values.
-     
-     setInitialConditions();
-   }
- 
-   // Return references to arrays.
-   
-   Array2D &aRef() { return a_m; }
-   Array2D &bRef() { return b_m; }
- 
-   // Return value for checking result of benchmark run.
- 
-   double resultCheck() const { return check_m; }
- 
-   // Return number of flops in this kernel.
- 
-   double opCount() const { return ( 90 * ((double)n_m - 2) * ((double)n_m - 2) ); }
- 
- protected:
- 
-   // 2D data arrays.
- 
-   Array2D a_m, b_m;
- 
-   // Problem check value.
- 
-   double check_m;
- 
-   // Problem size.
- 
-   int n_m;
-   
-   // Domains for stencil.
-   
-   Interval<1> I, J;
- 
- private:
- 
-   void setInitialConditions()
-   {
-     // Initialize arrays.
- 
-     aRef() = 0.0;
-     bRef() = 0.0;
-     Pooma::blockAndEvaluate();
-     aRef()(n_m/2,n_m/2) = 1000.0;
-   }
- };
- 
- // GMP version.
- 
- template<class EngineTag>
- class Doof2dBase<EngineTag, true> : public Implementation {
- public:
- 
-   // Typedefs for the Array types we'll be using here.
- 
-   typedef Array<2,double, MultiPatch<GridTag,EngineTag> > Array2D;
- 
-   // Constructor allows us to specify the number of patches in each direction
-   // and the number of guard cells.
- 
-   Doof2dBase(int np = 1, int ng = 0) 
-   : np_m(np), ng_m(ng), layout_m(NULL), a_m(NULL), b_m(NULL)
-   { }
-   
-   // Destructor deletes pointers.
-   
-   ~Doof2dBase()
-   {
-     delete a_m;
-     delete b_m;
-     delete layout_m;
-   }
- 
-   // Return references to arrays.
-   
-   Array2D &aRef() { return *a_m; }
-   Array2D &bRef() { return *b_m; }
-   
-   // Initialize function gets the size and adjusts the arrays.
-     
-   void initialize(int n) 
-   {
-     // Save the problem size. We need to make sure we have evenly sized blocks.
-     
-     n_m = (n / np_m) * np_m;
- 
-     // Delete old pointers.
-     
-     delete a_m;
-     delete b_m;
-     delete layout_m;
- 
-     // Get new array domain.
-     
-     Interval<1> N(1, n_m);
-     Interval<2> newDomain(N, N);
- 
-     // Create the block sizes.
-     
-     Loc<2> blocks(np_m, np_m);
- 
-     // Create the partitioner.
-     
- //     int gsize = np_m*.8;
- //     IndirectionList<int> ax(gsize);
- //     // upper half of each axis is doubled;
- //     int j=0;
- //     ax(0)=N[0].first();
- //     for(int i=1;i<gsize; ++i)
- //       {	
- // 	if(ax(i-1)/n>.4) ++j;
- // 	ax(i)=(i+j)*(n/np_m);
- //       }
- //     ax(gsize-1)=N[0].last()+1;
- 
-     Range<1> ax(N[0].first(),N[0].last()+1,n/np_m);
- 
-     Grid<2> grd(ax,ax);
-     GridPartition<2> partition(grd, GuardLayers<2>(ng_m));
-   
-     // Create the layout.
-     
-     layout_m = new GridLayout<2>(newDomain, partition,ReplicatedTag());
- 
-     // Create the arrays.
-     
-     a_m = new Array2D(*layout_m);
-     b_m = new Array2D(*layout_m);
- 
-     // Set up domains.
-     
-     I = Interval<1>(2,n_m-1);
-     J = Interval<1>(2,n_m-1);
- 
-     // Intialize Array element values.
-     
-     setInitialConditions();
-   }
- 
-   // Return value for checking result of benchmark run.
- 
-   double resultCheck() const { return check_m; }
- 
-   // Return number of flops in this kernel.
- 
-   double opCount() const { return ( 90 * ((double) n_m - 2) * ((double)n_m-2) ); }
- 
- protected:
- 
-   // 2D data arrays.
- 
-   Array2D *a_m, *b_m;
- 
-   // Problem check value.
- 
-   double check_m;
- 
-   // Problem size/number of patches.
- 
-   int n_m, np_m;
-   
-   // Guard layers.
- 
-   int ng_m;
- 
-   // Domains for stencil.
-   
-   Interval<1> I, J;
-   
-   // Layout.
-   
-   GridLayout<2> *layout_m;
- 
- private:
- 
-   void setInitialConditions()
-   {
-     // Initialize arrays.
- 
-     aRef() = 0.0;
-     bRef() = 0.0;
-     Pooma::blockAndEvaluate();
-     aRef()(n_m/2,n_m/2) = 1000.0;
-   }
- };
- 
- 
- //-----------------------------------------------------------------------------
- // Doof2dGMPCppTran class definition.
- //-----------------------------------------------------------------------------
- 
- template<class PatchTag, bool GMP>
- class Doof2dCppTran : public Doof2dBase<PatchTag,GMP> {
- public:
- 
-   typedef typename Doof2dBase<PatchTag, GMP>::Array2D Array2D;
- 
-   // Constructor allows us to specify the number of patches in each direction.
-   
-   Doof2dCppTran(int np = 1)
-   : Doof2dBase<PatchTag,GMP>(np)
-   { }
- 
-   // This is a C++Tran benchmark, perhaps using GMP.
- 
-   const char* type() const { return CppTranType(); }
-   const char* qualification() const
-   {
-     if (GMP)
-       {
-         if (typeid(PatchTag) == typeid(Brick))
-           return "BrickGMP";
-         else
-           return "CompBrickGMP";
-       }
-     else
-       {
-         if (typeid(PatchTag) == typeid(Brick))
-           return "Brick";
-         else
-           return "CompBrick";
-       }
-   }
- 
-   void run() 
-   {
-     const double fact = 1.0 / 9.0;
-     Array2D &a = aRef();
-     const Array2D &b = bRef();
-     int i, j, k;
- 
-     // Run kernel.
-     
-     for (j = 1; j <= n_m; j++) 
-     {
-       for (i = 1; i <= n_m; i++) 
-       {
- 	b(i,j) = 0.0;
-       }
-     }
-     b(n_m/2,n_m/2) = 1000.0;
-     for (k = 0; k < 10; ++k)
-     {
-       for (j = 1; j <= n_m; j++) 
-       {
- 	for (i = 1; i <= n_m; i++) 
- 	{
- 	  a(i,j) = b(i,j);
- 	}
-       }
-       for (j = 2; j <= n_m-1; j++) 
-       {
-         for (i = 2; i <= n_m-1; i++) 
- 	{
- 	  b(i,j) = fact *
- 	    (a(i+1,j+1) + a(i+1,j  ) + a(i+1,j-1) +
- 	     a(i  ,j+1) + a(i  ,j  ) + a(i  ,j-1) +
- 	     a(i-1,j+1) + a(i-1,j  ) + a(i-1,j-1));
- 	}
-       }
-     }
-      
-     // Save result for checking.
-     
-     check_m = b(n_m / 2, n_m / 2);
-   }
- };
- 
- 
- //-----------------------------------------------------------------------------
- // Doof2dGMPP2 class definition.
- //-----------------------------------------------------------------------------
- 
- template<class PatchTag, bool GMP>
- class Doof2dP2
-   : public Doof2dBase<PatchTag, GMP>
- {
- public:
- 
-   typedef typename Doof2dBase<PatchTag, GMP>::Array2D Array2D;
- 
-   // Constructor allows us to specify the number of patches in each direction.
-   
-   Doof2dP2(int np = 1, int ng = 0)
-     : Doof2dBase<PatchTag, GMP>(np,ng),
-       guarded_m(ng > 0)
-   { }
- 
-   // This is a P2 benchmark, perhaps using GMP.
- 
-   const char* type() const { return P2Type(); }
-   const char* qualification() const
-   {
-     if (guarded_m)
-     {
-       // we're using guard cells, so return a cryptic sounding
-       // 12 letter description
-       PAssert(GMP);
-       if (typeid(PatchTag) == typeid(Brick))
- 	return "GCBrickGMP";
-       else
- 	return "GCCmpBrckGMP";
-     }
-     else
-     {
-       if (GMP)
-       {
-         if (typeid(PatchTag) == typeid(Brick))
-           return "BrickGMP";
-         else
-           return "CompBrickGMP";
-       }
-       else
-       {
-         if (typeid(PatchTag) == typeid(Brick))
-           return "Brick";
-         else
-           return "CompBrick";
-       }
-     }
-   }
- 
-   void run() 
-   {
-     const double fact = 1.0 / 9.0;
-     Array2D &a = aRef();
-     const Array2D &b = bRef();
-     int k;
- 
-     // Run kernel.
-     
-     b = 0.0;
-     Pooma::blockAndEvaluate();
-     b(n_m/2,n_m/2) = 1000.0;
- 
-     for (k = 0; k < 10; ++k)
-     {
-       a = b;
-       b(I,J) = fact *
- 	(a(I+1,J+1) + a(I+1,J  ) + a(I+1,J-1) +
- 	 a(I  ,J+1) + a(I  ,J  ) + a(I  ,J-1) +
- 	 a(I-1,J+1) + a(I-1,J  ) + a(I-1,J-1));
-     }
- 
-     Pooma::blockAndEvaluate();
- 
-     // Save result for checking.
-     
-     check_m = b(n_m / 2, n_m / 2);
-   }
- 
- private:
-   bool guarded_m;
- };
- 
- //-----------------------------------------------------------------------------
- // Stencil DoofNinePt
- //-----------------------------------------------------------------------------
- 
- class DoofNinePt
- {
- public:
-   DoofNinePt() {}
- 
-   template <class A>
-   inline
-   typename A::Element_t
-   operator()(const A& x, int i, int j) const
-   {
-     return ( (1.0/9.0) *
-              ( x(i+1,j+1) + x(i+1,j  ) + x(i+1,j-1) +
-                x(i  ,j+1) + x(i  ,j  ) + x(i  ,j-1) +
-                x(i-1,j+1) + x(i-1,j  ) + x(i-1,j-1) ) );
-   }
- 
-   inline int lowerExtent(int) const { return 1; }
-   inline int upperExtent(int) const { return 1; }
- 
- private:
- };
- 
- //-----------------------------------------------------------------------------
- // Doof2dGMPP2Opt class definition.
- //-----------------------------------------------------------------------------
- 
- template<class PatchTag, bool GMP>
- class Doof2dP2Opt
-   : public Doof2dBase<PatchTag, GMP>
- {
- public:
- 
-   typedef typename Doof2dBase<PatchTag, GMP>::Array2D Array2D;
- 
-   // Constructor allows us to specify the number of patches in each direction.
-   
-   Doof2dP2Opt(int np = 1, int ng = 0)
-     : Doof2dBase<PatchTag, GMP>(np,ng),
-       guarded_m(ng > 0)
-   { }
- 
-   // This is a P2 benchmark, perhaps using GMP.
- 
-   const char* type() const { return "P2Opt"; }
-   const char* qualification() const
-   {
-     if (guarded_m)
-     {
-       // we're using guard cells, so return a cryptic sounding
-       // 12 letter description
-       PAssert(GMP);
-       if (typeid(PatchTag) == typeid(Brick))
- 	return "GCBrickGMP";
-       else
- 	return "GCCmpBrckGMP";
-     }
-     else
-     {
-       if (GMP)
-       {
-         if (typeid(PatchTag) == typeid(Brick))
-           return "BrickGMP";
-         else
-           return "CompBrickGMP";
-       }
-       else
-       {
-         if (typeid(PatchTag) == typeid(Brick))
-           return "Brick";
-         else
-           return "CompBrick";
-       }
-     }
-   }
- 
-   void run() 
-   {
-     Array2D &a = aRef();
-     const Array2D &b = bRef();
-     int k;
-     Interval<2> IJ(I,J);
- 
-     // Run kernel.
-     
-     b = 0.0;
-     Pooma::blockAndEvaluate();
-     b(n_m/2,n_m/2) = 1000.0;
- 
-     for (k = 0; k < 10; ++k)
-     {
-       a = b;
- 
-       // Note we use this form of the stencil since adding guard cells can
-       // add external guard cells, so the domain of a might be bigger than
-       // we expect, in which case stencil_m(a) would be bigger than IJ.
- 
-       b(IJ) = stencil_m(a,IJ);
-     }
- 
-     Pooma::blockAndEvaluate();
- 
-     // Save result for checking.
-     
-     check_m = b(n_m / 2, n_m / 2);
-   }
- 
- private:
-   bool guarded_m;
-   Stencil<DoofNinePt> stencil_m;
- };
- 
- 
- 
- void cpptran1(Benchmark&);
- void cpptran2(Benchmark&);
- void pooma1(Benchmark&);
- void pooma1c(Benchmark&);
- void pooma2(Benchmark&);
- void pooma3(Benchmark&);
- 
- #endif // POOMA_BENCHMARKS_DOOF2DGMP_DOOF2DGMP_H
- 
- // ACL:rcsinfo
- // ----------------------------------------------------------------------
- // $RCSfile: Doof2dGMP.h,v $   $Author: sa_smith $
- // $Revision: 1.20 $   $Date: 1999/05/20 12:24
- // ----------------------------------------------------------------------
- // ACL:rcsinfo
--- 0 ----
Index: Makefile.user
===================================================================
RCS file: Makefile.user
diff -N Makefile.user
*** /tmp/cvsYKwYl8	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,67 ****
- ##################################################################
- # ACL:license
- #  ----------------------------------------------------------------------
- #  This software and ancillary information (herein called "SOFTWARE")
- #  called POOMA (Parallel Object-Oriented Methods and Applications) is
- #  made available under the terms described here.  The SOFTWARE has been
- #  approved for release with associated LA-CC Number LA-CC-98-65.
- #  
- #  Unless otherwise indicated, this SOFTWARE has been authored by an
- #  employee or employees of the University of California, operator of the
- #  Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- #  the U.S. Department of Energy.  The U.S. Government has rights to use,
- #  reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- #  prepare derivative works and publicly display this SOFTWARE without 
- #  charge, provided that this Notice and any statement of authorship are 
- #  reproduced on all copies.  Neither the Government nor the University 
- #  makes any warranty, express or implied, or assumes any liability or 
- #  responsibility for the use of this SOFTWARE.
- #  
- #  If SOFTWARE is modified to produce derivative works, such modified
- #  SOFTWARE should be clearly marked, so as not to confuse it with the
- #  version available from LANL.
- #  
- #  For more information about POOMA, send e-mail to address@hidden,
- #  or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- #  ----------------------------------------------------------------------
- # ACL:license
- 
- 
- 
- # simple user-application Makefile using the version of POOMA
- # installed in the 'POOMADIR' directory.
- ##################################################################
- 
- ### include the POOMA makefile stub, to get compiler flags and libraries
- 
- include $(POOMADIR)/$(POOMAARCH)/lib/Makefile.pooma
- 
- ### the name of this benchmark
- 
- BENCHMARK = Doof2dUMP
- 
- 
- ### the sources for this compile
- 
- SRC = Doof2dUMP.cpp cpptran1.cpp cpptran2.cpp pooma1.cpp pooma1c.cpp pooma2.cpp pooma3.cpp
- 
- 
- ### the main target for this makefile
- 
- $(BENCHMARK): $(SRC)
- 	$(POOMA_CXX) $(POOMA_CXX_OPT_ARGS) -o $(BENCHMARK) $(SRC) $(POOMA_INCLUDES) $(POOMA_DEFINES) $(POOMA_LIBS)
- 
- 
- ### clean things up a bit
- 
- clean:
- 	rm -rf $(BENCHMARK) *.o *.ii ii_files ti_files
- 
- 
- 
- # ACL:rcsinfo
- #  ----------------------------------------------------------------------
- #  $RCSfile: Makefile.user,v $   $Author: swhaney $
- #  $Revision: 1.2 $   $Date: 2000/03/07 13:14:50 $
- #  ----------------------------------------------------------------------
- # ACL:rcsinfo
--- 0 ----
Index: cpptran1.cpp
===================================================================
RCS file: cpptran1.cpp
diff -N cpptran1.cpp
*** /tmp/cvsl2XCZJ	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,48 ****
- // -*- C++ -*-
- // ACL:license
- // ----------------------------------------------------------------------
- // This software and ancillary information (herein called "SOFTWARE")
- // called POOMA (Parallel Object-Oriented Methods and Applications) is
- // made available under the terms described here.  The SOFTWARE has been
- // approved for release with associated LA-CC Number LA-CC-98-65.
- // 
- // Unless otherwise indicated, this SOFTWARE has been authored by an
- // employee or employees of the University of California, operator of the
- // Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- // the U.S. Department of Energy.  The U.S. Government has rights to use,
- // reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- // prepare derivative works and publicly display this SOFTWARE without 
- // charge, provided that this Notice and any statement of authorship are 
- // reproduced on all copies.  Neither the Government nor the University 
- // makes any warranty, express or implied, or assumes any liability or 
- // responsibility for the use of this SOFTWARE.
- // 
- // If SOFTWARE is modified to produce derivative works, such modified
- // SOFTWARE should be clearly marked, so as not to confuse it with the
- // version available from LANL.
- // 
- // For more information about POOMA, send e-mail to address@hidden,
- // or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- // ----------------------------------------------------------------------
- // ACL:license
- 
- // include files
- #include "Doof2dGMP.h"
- #include "Pooma/Pooma.h"
- 
- 
- //-----------------------------------------------------------------------------
- // Main program.
- //-----------------------------------------------------------------------------
- 
- void cpptran1(Benchmark& doof2d)
- {
-   doof2d.addImplementation(new Doof2dCppTran<Brick,false>);
- }
- 
- // ACL:rcsinfo
- // ----------------------------------------------------------------------
- // $RCSfile: cpptran1.cpp,v $   $Author: swhaney $
- // $Revision: 1.2 $   $Date: 2000/03/07 13:14:51 $
- // ----------------------------------------------------------------------
- // ACL:rcsinfo
--- 0 ----
Index: cpptran2.cpp
===================================================================
RCS file: cpptran2.cpp
diff -N cpptran2.cpp
*** /tmp/cvsiC3lDl	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,47 ****
- // -*- C++ -*-
- // ACL:license
- // ----------------------------------------------------------------------
- // This software and ancillary information (herein called "SOFTWARE")
- // called POOMA (Parallel Object-Oriented Methods and Applications) is
- // made available under the terms described here.  The SOFTWARE has been
- // approved for release with associated LA-CC Number LA-CC-98-65.
- // 
- // Unless otherwise indicated, this SOFTWARE has been authored by an
- // employee or employees of the University of California, operator of the
- // Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- // the U.S. Department of Energy.  The U.S. Government has rights to use,
- // reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- // prepare derivative works and publicly display this SOFTWARE without 
- // charge, provided that this Notice and any statement of authorship are 
- // reproduced on all copies.  Neither the Government nor the University 
- // makes any warranty, express or implied, or assumes any liability or 
- // responsibility for the use of this SOFTWARE.
- // 
- // If SOFTWARE is modified to produce derivative works, such modified
- // SOFTWARE should be clearly marked, so as not to confuse it with the
- // version available from LANL.
- // 
- // For more information about POOMA, send e-mail to address@hidden,
- // or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- // ----------------------------------------------------------------------
- // ACL:license
- 
- // include files
- #include "Doof2dGMP.h"
- #include "Pooma/Pooma.h"
- 
- //-----------------------------------------------------------------------------
- // Main program.
- //-----------------------------------------------------------------------------
- 
- void cpptran2(Benchmark& doof2d)
- {
-   doof2d.addImplementation(new Doof2dCppTran<Brick,true>(doof2d.numPatches()));
- }
- 
- // ACL:rcsinfo
- // ----------------------------------------------------------------------
- // $RCSfile: cpptran2.cpp,v $   $Author: swhaney $
- // $Revision: 1.2 $   $Date: 2000/03/07 13:14:51 $
- // ----------------------------------------------------------------------
- // ACL:rcsinfo
--- 0 ----
Index: include.mk
===================================================================
RCS file: include.mk
diff -N include.mk
*** /tmp/cvsbjK8gX	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,59 ****
- # Generated by mm.pl: Mon Mar  9 13:58:39 MST 1998
- # ACL:license
- #  ----------------------------------------------------------------------
- #  This software and ancillary information (herein called "SOFTWARE")
- #  called POOMA (Parallel Object-Oriented Methods and Applications) is
- #  made available under the terms described here.  The SOFTWARE has been
- #  approved for release with associated LA-CC Number LA-CC-98-65.
- #  
- #  Unless otherwise indicated, this SOFTWARE has been authored by an
- #  employee or employees of the University of California, operator of the
- #  Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- #  the U.S. Department of Energy.  The U.S. Government has rights to use,
- #  reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- #  prepare derivative works and publicly display this SOFTWARE without 
- #  charge, provided that this Notice and any statement of authorship are 
- #  reproduced on all copies.  Neither the Government nor the University 
- #  makes any warranty, express or implied, or assumes any liability or 
- #  responsibility for the use of this SOFTWARE.
- #  
- #  If SOFTWARE is modified to produce derivative works, such modified
- #  SOFTWARE should be clearly marked, so as not to confuse it with the
- #  version available from LANL.
- #  
- #  For more information about POOMA, send e-mail to address@hidden,
- #  or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- #  ----------------------------------------------------------------------
- # ACL:license
- 
- 
- # Wrap make components from SHARED_ROOT and the current directory in the 
- # proper order so that variables like ODIR have the correct directory-specific 
- # value at the right moment.  See the included files for details of what they 
- # are doing. This file should NOT be manually edited.
- 
- # Set NEXTDIR, THISDIR and DIR_LIST
- include $(SHARED_ROOT)/include1.mk
- 
- # Include list of subdirectories to process
- -include $(THISDIR)/subdir.mk
- 
- # Set ODIR, PROJECT_INCLUDES, UNIQUE
- include $(SHARED_ROOT)/include2.mk
- 
- # Set list of object files, relative to ODIR
- -include $(THISDIR)/objfile.mk
- 
- # Set rules for the ODIR directory 
- include $(SHARED_ROOT)/compilerules.mk
- 
- # Remove current dir from DIR_LIST
- DIR_LIST :=$(filter-out $(firstword $(DIR_LIST)), $(DIR_LIST))
- 
- 
- # ACL:rcsinfo
- #  ----------------------------------------------------------------------
- #  $RCSfile: include.mk,v $   $Author: swhaney $
- #  $Revision: 1.2 $   $Date: 2000/03/07 13:14:51 $
- #  ----------------------------------------------------------------------
- # ACL:rcsinfo
--- 0 ----
Index: makefile
===================================================================
RCS file: makefile
diff -N makefile
*** /tmp/cvse99ZUy	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,54 ****
- # Generated by mm.pl: Mon Mar  9 13:58:39 MST 1998
- # ACL:license
- #  ----------------------------------------------------------------------
- #  This software and ancillary information (herein called "SOFTWARE")
- #  called POOMA (Parallel Object-Oriented Methods and Applications) is
- #  made available under the terms described here.  The SOFTWARE has been
- #  approved for release with associated LA-CC Number LA-CC-98-65.
- #  
- #  Unless otherwise indicated, this SOFTWARE has been authored by an
- #  employee or employees of the University of California, operator of the
- #  Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- #  the U.S. Department of Energy.  The U.S. Government has rights to use,
- #  reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- #  prepare derivative works and publicly display this SOFTWARE without 
- #  charge, provided that this Notice and any statement of authorship are 
- #  reproduced on all copies.  Neither the Government nor the University 
- #  makes any warranty, express or implied, or assumes any liability or 
- #  responsibility for the use of this SOFTWARE.
- #  
- #  If SOFTWARE is modified to produce derivative works, such modified
- #  SOFTWARE should be clearly marked, so as not to confuse it with the
- #  version available from LANL.
- #  
- #  For more information about POOMA, send e-mail to address@hidden,
- #  or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- #  ----------------------------------------------------------------------
- # ACL:license
- 
- # This file is user-editable
- 
- PROJECT_ROOT = $(shell cd ../..; pwd)
- include $(PROJECT_ROOT)/config/head.mk
- 
- PASS=APP
- 
- default:: Doof2dGMP
- 
- .PHONY: Doof2dGMP
- 
- Doof2dGMP:: $(ODIR)/Doof2dGMP
- 
- $(ODIR)/Doof2dGMP: $(ODIR)/Doof2dGMP.o $(ODIR)/cpptran1.o $(ODIR)/cpptran2.o \
- 		   $(ODIR)/pooma1.o $(ODIR)/pooma2.o $(ODIR)/pooma3.o \
- 		   $(ODIR)/pooma1c.o
- 	$(LinkToSuite)
- 
- include $(SHARED_ROOT)/tail.mk
- 
- # ACL:rcsinfo
- #  ----------------------------------------------------------------------
- #  $RCSfile: makefile,v $   $Author: julianc $
- #  $Revision: 1.3 $   $Date: 2000/07/21 21:34:44 $
- #  ----------------------------------------------------------------------
- # ACL:rcsinfo
--- 0 ----
Index: pooma1.cpp
===================================================================
RCS file: pooma1.cpp
diff -N pooma1.cpp
*** /tmp/cvsJM2Vya	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,47 ****
- // -*- C++ -*-
- // ACL:license
- // ----------------------------------------------------------------------
- // This software and ancillary information (herein called "SOFTWARE")
- // called POOMA (Parallel Object-Oriented Methods and Applications) is
- // made available under the terms described here.  The SOFTWARE has been
- // approved for release with associated LA-CC Number LA-CC-98-65.
- // 
- // Unless otherwise indicated, this SOFTWARE has been authored by an
- // employee or employees of the University of California, operator of the
- // Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- // the U.S. Department of Energy.  The U.S. Government has rights to use,
- // reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- // prepare derivative works and publicly display this SOFTWARE without 
- // charge, provided that this Notice and any statement of authorship are 
- // reproduced on all copies.  Neither the Government nor the University 
- // makes any warranty, express or implied, or assumes any liability or 
- // responsibility for the use of this SOFTWARE.
- // 
- // If SOFTWARE is modified to produce derivative works, such modified
- // SOFTWARE should be clearly marked, so as not to confuse it with the
- // version available from LANL.
- // 
- // For more information about POOMA, send e-mail to address@hidden,
- // or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- // ----------------------------------------------------------------------
- // ACL:license
- 
- // include files
- #include "Doof2dGMP.h"
- #include "Pooma/Pooma.h"
- 
- //-----------------------------------------------------------------------------
- // Main program.
- //-----------------------------------------------------------------------------
- 
- void pooma1(Benchmark& doof2d)
- {
-   doof2d.addImplementation(new Doof2dP2<Brick,false>);
- }
- 
- // ACL:rcsinfo
- // ----------------------------------------------------------------------
- // $RCSfile: pooma1.cpp,v $   $Author: swhaney $
- // $Revision: 1.2 $   $Date: 2000/03/07 13:14:51 $
- // ----------------------------------------------------------------------
- // ACL:rcsinfo
--- 0 ----
Index: pooma1c.cpp
===================================================================
RCS file: pooma1c.cpp
diff -N pooma1c.cpp
*** /tmp/cvsUrCUcM	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,47 ****
- // -*- C++ -*-
- // ACL:license
- // ----------------------------------------------------------------------
- // This software and ancillary information (herein called "SOFTWARE")
- // called POOMA (Parallel Object-Oriented Methods and Applications) is
- // made available under the terms described here.  The SOFTWARE has been
- // approved for release with associated LA-CC Number LA-CC-98-65.
- // 
- // Unless otherwise indicated, this SOFTWARE has been authored by an
- // employee or employees of the University of California, operator of the
- // Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- // the U.S. Department of Energy.  The U.S. Government has rights to use,
- // reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- // prepare derivative works and publicly display this SOFTWARE without 
- // charge, provided that this Notice and any statement of authorship are 
- // reproduced on all copies.  Neither the Government nor the University 
- // makes any warranty, express or implied, or assumes any liability or 
- // responsibility for the use of this SOFTWARE.
- // 
- // If SOFTWARE is modified to produce derivative works, such modified
- // SOFTWARE should be clearly marked, so as not to confuse it with the
- // version available from LANL.
- // 
- // For more information about POOMA, send e-mail to address@hidden,
- // or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- // ----------------------------------------------------------------------
- // ACL:license
- 
- // include files
- #include "Doof2dGMP.h"
- #include "Pooma/Pooma.h"
- 
- //-----------------------------------------------------------------------------
- // Main program.
- //-----------------------------------------------------------------------------
- 
- void pooma1c(Benchmark& doof2d)
- {
-   doof2d.addImplementation(new Doof2dP2<CompressibleBrick,false>);
- }
- 
- // ACL:rcsinfo
- // ----------------------------------------------------------------------
- // $RCSfile: pooma1c.cpp,v $   $Author: swhaney $
- // $Revision: 1.2 $   $Date: 2000/03/07 13:14:52 $
- // ----------------------------------------------------------------------
- // ACL:rcsinfo
--- 0 ----
Index: pooma2.cpp
===================================================================
RCS file: pooma2.cpp
diff -N pooma2.cpp
*** /tmp/cvsDvNWQn	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,49 ****
- // -*- C++ -*-
- // ACL:license
- // ----------------------------------------------------------------------
- // This software and ancillary information (herein called "SOFTWARE")
- // called POOMA (Parallel Object-Oriented Methods and Applications) is
- // made available under the terms described here.  The SOFTWARE has been
- // approved for release with associated LA-CC Number LA-CC-98-65.
- // 
- // Unless otherwise indicated, this SOFTWARE has been authored by an
- // employee or employees of the University of California, operator of the
- // Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- // the U.S. Department of Energy.  The U.S. Government has rights to use,
- // reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- // prepare derivative works and publicly display this SOFTWARE without 
- // charge, provided that this Notice and any statement of authorship are 
- // reproduced on all copies.  Neither the Government nor the University 
- // makes any warranty, express or implied, or assumes any liability or 
- // responsibility for the use of this SOFTWARE.
- // 
- // If SOFTWARE is modified to produce derivative works, such modified
- // SOFTWARE should be clearly marked, so as not to confuse it with the
- // version available from LANL.
- // 
- // For more information about POOMA, send e-mail to address@hidden,
- // or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- // ----------------------------------------------------------------------
- // ACL:license
- 
- // include files
- #include "Doof2dGMP.h"
- #include "Pooma/Pooma.h"
- 
- //-----------------------------------------------------------------------------
- // Main program.
- //-----------------------------------------------------------------------------
- 
- void pooma2(Benchmark& doof2d)
- {
-   doof2d.addImplementation(new Doof2dP2<Brick,true>(doof2d.numPatches()));
-   doof2d.addImplementation(new Doof2dP2<Brick,true>(doof2d.numPatches(),1));
-   doof2d.addImplementation(new Doof2dP2Opt<Brick,true>(doof2d.numPatches(),1));
- }
- 
- // ACL:rcsinfo
- // ----------------------------------------------------------------------
- // $RCSfile: pooma2.cpp,v $   $Author: swhaney $
- // $Revision: 1.2 $   $Date: 2000/03/07 13:14:52 $
- // ----------------------------------------------------------------------
- // ACL:rcsinfo
--- 0 ----
Index: pooma3.cpp
===================================================================
RCS file: pooma3.cpp
diff -N pooma3.cpp
*** /tmp/cvsSvs2uZ	Fri Sep 28 10:26:05 2001
--- /dev/null	Fri Mar 23 21:37:44 2001
***************
*** 1,48 ****
- // -*- C++ -*-
- // ACL:license
- // ----------------------------------------------------------------------
- // This software and ancillary information (herein called "SOFTWARE")
- // called POOMA (Parallel Object-Oriented Methods and Applications) is
- // made available under the terms described here.  The SOFTWARE has been
- // approved for release with associated LA-CC Number LA-CC-98-65.
- // 
- // Unless otherwise indicated, this SOFTWARE has been authored by an
- // employee or employees of the University of California, operator of the
- // Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
- // the U.S. Department of Energy.  The U.S. Government has rights to use,
- // reproduce, and distribute this SOFTWARE. The public may copy, distribute,
- // prepare derivative works and publicly display this SOFTWARE without 
- // charge, provided that this Notice and any statement of authorship are 
- // reproduced on all copies.  Neither the Government nor the University 
- // makes any warranty, express or implied, or assumes any liability or 
- // responsibility for the use of this SOFTWARE.
- // 
- // If SOFTWARE is modified to produce derivative works, such modified
- // SOFTWARE should be clearly marked, so as not to confuse it with the
- // version available from LANL.
- // 
- // For more information about POOMA, send e-mail to address@hidden,
- // or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
- // ----------------------------------------------------------------------
- // ACL:license
- 
- // include files
- #include "Doof2dGMP.h"
- #include "Pooma/Pooma.h"
- 
- //-----------------------------------------------------------------------------
- // Main program.
- //-----------------------------------------------------------------------------
- 
- void pooma3(Benchmark& doof2d)
- {
-   doof2d.addImplementation(
-     new Doof2dP2<CompressibleBrick,true>(doof2d.numPatches()));
- }
- 
- // ACL:rcsinfo
- // ----------------------------------------------------------------------
- // $RCSfile: pooma3.cpp,v $   $Author: swhaney $
- // $Revision: 1.2 $   $Date: 2000/03/07 13:14:52 $
- // ----------------------------------------------------------------------
- // ACL:rcsinfo
--- 0 ----