[cig-commits] commit: Remove unused {Cell}{Edge}_Viscosity_Coarsen

Mercurial hg at geodynamics.org
Thu May 5 04:00:12 PDT 2011


changeset:   245:6d824cc1cdbf
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu May 05 03:58:42 2011 -0700
files:       src/Cell_Viscosity_Coarsen.C src/Cell_Viscosity_Coarsen.h src/Edge_Viscosity_Coarsen.C src/Edge_Viscosity_Coarsen.h src/FACStokes/fix_viscosity.C src/main.C wscript
description:
Remove unused {Cell}{Edge}_Viscosity_Coarsen


diff -r e4d74f92d629 -r 6d824cc1cdbf src/Cell_Viscosity_Coarsen.C
--- a/src/Cell_Viscosity_Coarsen.C	Thu May 05 03:54:22 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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:   Weighted averaging operator for side-centered double data on
- *                a Cartesian mesh. 
- *
- ************************************************************************/
-
-#ifndef included_geom_Cell_Viscosity_Coarsen_C
-#define included_geom_Cell_Viscosity_Coarsen_C
-
-#include "Cell_Viscosity_Coarsen.h"
-
-#include <float.h>
-#include <math.h>
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/pdat/CellData.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/NodeData.h"
-#include "SAMRAI/pdat/NodeVariable.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "viscosity_coarsen.h"
-
-using namespace SAMRAI;
-
-void SAMRAI::geom::Cell_Viscosity_Coarsen::coarsen(hier::Patch& coarse,
-                                                   const hier::Patch& fine,
-                                                   const int dst_component,
-                                                   const int src_component,
-                                                   const hier::Box& coarse_box,
-                                                   const hier::IntVector& ratio)
-  const
-{
-  const tbox::Dimension& dimension(getDim());
-  const int dim(dimension.getValue());
-
-  TBOX_DIM_ASSERT_CHECK_DIM_ARGS4(dimension, coarse, fine, coarse_box, ratio);
-
-  tbox::Pointer<pdat::CellData<double> >
-    cell_viscosity_fine_ptr = fine.getPatchData(src_component);
-  pdat::CellData<double> &cell_viscosity_fine(*cell_viscosity_fine_ptr);
-  tbox::Pointer<pdat::NodeData<double> > edge_viscosity_fine_2D_ptr;
-  tbox::Pointer<pdat::EdgeData<double> > edge_viscosity_fine_3D_ptr;
-  if(dim==2)
-    edge_viscosity_fine_2D_ptr = fine.getPatchData(edge_viscosity_id);
-  else
-    edge_viscosity_fine_3D_ptr = fine.getPatchData(edge_viscosity_id);
-
-  tbox::Pointer<pdat::CellData<double> >
-    cell_viscosity_coarse_ptr = coarse.getPatchData(dst_component);
-  pdat::CellData<double> &cell_viscosity_coarse(*cell_viscosity_coarse_ptr);
-
-  TBOX_ASSERT(!cell_viscosity_coarse_ptr.isNull());
-  TBOX_ASSERT(!cell_viscosity_fine_ptr.isNull());
-  TBOX_ASSERT(cell_viscosity_fine.getDepth() == cell_viscosity_coarse.getDepth());
-  TBOX_ASSERT(cell_viscosity_coarse.getDepth() == 1);
-
-  const tbox::Pointer<CartesianPatchGeometry> cgeom =
-    coarse.getPatchGeometry();
-
-  hier::Index ip(hier::Index::getZeroIndex(dimension)), jp(ip), kp(ip);
-  ip[0]=1;
-  jp[1]=1;
-  if(dim>2)
-    kp[2]=1;
-
-  for(pdat::CellIterator ci(coarse_box); ci; ci++)
-    {
-      pdat::CellIndex coarse_cell(*ci);
-
-      if(dim==2)
-        {
-          cell_viscosity_coarse(coarse_cell)=
-            viscosity_coarsen_2D(cell_viscosity_fine,*edge_viscosity_fine_2D_ptr,
-                                 coarse_cell*2+ip+jp);
-        }
-      else
-        {
-          cell_viscosity_coarse(coarse_cell)=
-            viscosity_coarsen_3D(cell_viscosity_fine,*edge_viscosity_fine_3D_ptr,
-                                 coarse_cell*2);
-        }
-    }
-}
-
-#endif
diff -r e4d74f92d629 -r 6d824cc1cdbf src/Cell_Viscosity_Coarsen.h
--- a/src/Cell_Viscosity_Coarsen.h	Thu May 05 03:54:22 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +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:   Weighted averaging operator for side-centered double data on
- *                a Cartesian mesh. 
- *
- ************************************************************************/
-
-#ifndef included_geom_Cell_Viscosity_Coarsen
-#define included_geom_Cell_Viscosity_Coarsen
-
-#include "SAMRAI/SAMRAI_config.h"
-
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/hier/Box.h"
-#include "SAMRAI/hier/IntVector.h"
-#include "SAMRAI/hier/Patch.h"
-#include "SAMRAI/tbox/Pointer.h"
-#include "SAMRAI/pdat/CellVariable.h"
-
-#include <string>
-
-namespace SAMRAI {
-namespace geom {
-
-/**
- * Class Cell_Viscosity_Coarsen implements averaging 
- * for the cell-centered component of the viscosity.
- *
- * The name of this method when specifying it in the input file is
- * "CELL_VISCOSITY_COARSEN"
- *
- * @see xfer::CoarsenOperator
- */
-
-class Cell_Viscosity_Coarsen:
-   public xfer::CoarsenOperator
-{
-public:
-  /**
-   * Uninteresting default constructor.
-   */
-  explicit Cell_Viscosity_Coarsen(const tbox::Dimension& dim,
-                                  const int &edge_viscosity):
-    xfer::CoarsenOperator(dim, "CELL_VISCOSITY_COARSEN"),
-    edge_viscosity_id(edge_viscosity)
-  {
-    d_name_id = "CELL_VISCOSITY_COARSEN";
-  }
-
-  /**
-   * Uninteresting virtual destructor.
-   */
-  virtual ~Cell_Viscosity_Coarsen(){}
-
-  /**
-   * Return true if the variable and name std::string match the cell-centered
-   * double weighted averaging; otherwise, return false.
-   */
-  
-  bool findCoarsenOperator(const tbox::Pointer<hier::Variable>& var,
-                           const std::string& op_name) const
-  {
-    TBOX_DIM_ASSERT_CHECK_ARGS2(*this, *var);
-
-    const tbox::Pointer<pdat::CellVariable<double> > cast_var(var);
-    if (!cast_var.isNull() && (op_name == d_name_id)) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Return name std::string identifier of this coarsening operator.
-   */
-  const std::string& getOperatorName() const
-  {
-    return d_name_id;
-  }
-
-  /**
-   * The priority of cell-centered double weighted averaging is 0.
-   * It will be performed before any user-defined coarsen operations.
-   */
-  int getOperatorPriority() const
-  {
-    return 0;
-  }
-
-  /**
-   * The stencil width of the weighted averaging operator is the vector of
-   * zeros.  That is, its stencil does not extend outside the fine box.
-   */
-  hier::IntVector getStencilWidth() const
-  {
-    return hier::IntVector::getZero(getDim());
-  }
-
-  /**
-   * Coarsen the source component on the fine patch to the destination
-   * component on the coarse patch using the cell-centered double weighted
-   * averaging operator.  Coarsening is performed on the intersection of
-   * the destination patch and the coarse box.  It is assumed that the
-   * fine patch contains sufficient data for the stencil width of the
-   * coarsening operator.
-   */
-  void
-  coarsen(
-          hier::Patch& coarse,
-          const hier::Patch& fine,
-          const int dst_component,
-          const int src_component,
-          const hier::Box& coarse_box,
-          const hier::IntVector& ratio) const;
-
-private:
-  std::string d_name_id;
-  int edge_viscosity_id;
-};
-
-}
-}
-#endif
diff -r e4d74f92d629 -r 6d824cc1cdbf src/Edge_Viscosity_Coarsen.C
--- a/src/Edge_Viscosity_Coarsen.C	Thu May 05 03:54:22 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +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:   Weighted averaging operator for side-centered double data on
- *                a Cartesian mesh. 
- *
- ************************************************************************/
-
-#ifndef included_geom_Edge_Viscosity_Coarsen_C
-#define included_geom_Edge_Viscosity_Coarsen_C
-
-#include "Edge_Viscosity_Coarsen.h"
-
-#include <float.h>
-#include <math.h>
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/pdat/CellData.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/NodeData.h"
-#include "SAMRAI/pdat/NodeVariable.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "viscosity_coarsen.h"
-
-using namespace SAMRAI;
-
-void SAMRAI::geom::Edge_Viscosity_Coarsen::coarsen(hier::Patch& coarse,
-                                      const hier::Patch& fine,
-                                      const int dst_component,
-                                      const int src_component,
-                                      const hier::Box& coarse_box,
-                                      const hier::IntVector& ratio) const
-{
-  const tbox::Dimension& dimension(getDim());
-  const int dim(dimension.getValue());
-
-  TBOX_DIM_ASSERT_CHECK_DIM_ARGS4(dimension, coarse, fine, coarse_box, ratio);
-
-  tbox::Pointer<pdat::CellData<double> >
-    cell_viscosity_fine_ptr = fine.getPatchData(cell_viscosity_id);
-  pdat::CellData<double> &cell_viscosity_fine(*cell_viscosity_fine_ptr);
-  TBOX_ASSERT(!cell_viscosity_fine_ptr.isNull());
-
-  tbox::Pointer<pdat::NodeData<double> > edge_viscosity_fine_2D_ptr;
-  tbox::Pointer<pdat::EdgeData<double> > edge_viscosity_fine_3D_ptr;
-  if(dim==2)
-    {
-      edge_viscosity_fine_2D_ptr = fine.getPatchData(src_component);
-      TBOX_ASSERT(!edge_viscosity_fine_2D_ptr.isNull());
-    }
-  else
-    {
-      edge_viscosity_fine_3D_ptr = fine.getPatchData(src_component);
-      TBOX_ASSERT(!edge_viscosity_fine_3D_ptr.isNull());
-    }
-
-  tbox::Pointer<pdat::NodeData<double> > edge_viscosity_coarse_2D_ptr;
-  tbox::Pointer<pdat::EdgeData<double> > edge_viscosity_coarse_3D_ptr;
-  if(dim==2)
-    {
-      edge_viscosity_coarse_2D_ptr = coarse.getPatchData(dst_component);
-      TBOX_ASSERT(!edge_viscosity_coarse_2D_ptr.isNull());
-      TBOX_ASSERT(edge_viscosity_fine_2D_ptr->getDepth()
-                  == edge_viscosity_coarse_2D_ptr->getDepth());
-      TBOX_ASSERT(edge_viscosity_coarse_2D_ptr->getDepth() == 1);
-    }
-  else
-    {
-      edge_viscosity_coarse_3D_ptr = coarse.getPatchData(dst_component);
-      TBOX_ASSERT(!edge_viscosity_coarse_3D_ptr.isNull());
-      TBOX_ASSERT(edge_viscosity_fine_3D_ptr->getDepth()
-                  == edge_viscosity_coarse_3D_ptr->getDepth());
-      TBOX_ASSERT(edge_viscosity_coarse_3D_ptr->getDepth() == 1);
-    }
-
-
-  const tbox::Pointer<CartesianPatchGeometry> cgeom =
-    coarse.getPatchGeometry();
-
-  hier::Index ip(hier::Index::getZeroIndex(dimension)), jp(ip), kp(ip);
-  ip[0]=1;
-  jp[1]=1;
-  if(dim>2)
-    kp[2]=1;
-  hier::Index pp[]={ip,jp,kp};
-
-  if(dim==2)
-    {
-      for(pdat::NodeIterator ni(coarse_box); ni; ni++)
-        {
-          pdat::NodeIndex coarse_edge(*ni);
-
-          (*edge_viscosity_coarse_2D_ptr)(coarse_edge)=
-            viscosity_coarsen_2D(cell_viscosity_fine,*edge_viscosity_fine_2D_ptr,
-                                 coarse_edge*2);
-        }
-    }
-  else
-    {
-      for(int axis=0;axis<3;++axis)
-        {
-          const int axis2((axis+1)%3), axis3((axis+2)%3);
-          for(pdat::EdgeIterator ni(coarse_box,axis); ni; ni++)
-            {
-              pdat::EdgeIndex coarse_edge(*ni);
-
-              (*edge_viscosity_coarse_3D_ptr)(coarse_edge)=
-                viscosity_coarsen_3D(cell_viscosity_fine,
-                                     *edge_viscosity_fine_3D_ptr,
-                                     coarse_edge*2-pp[axis2]-pp[axis3]);
-            }
-        }
-    }
-}
-#endif
diff -r e4d74f92d629 -r 6d824cc1cdbf src/Edge_Viscosity_Coarsen.h
--- a/src/Edge_Viscosity_Coarsen.h	Thu May 05 03:54:22 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +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:   Weighted averaging operator for side-centered double data on
- *                a Cartesian mesh. 
- *
- ************************************************************************/
-
-#ifndef included_geom_Edge_Viscosity_Coarsen
-#define included_geom_Edge_Viscosity_Coarsen
-
-#include "SAMRAI/SAMRAI_config.h"
-
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/hier/Box.h"
-#include "SAMRAI/hier/IntVector.h"
-#include "SAMRAI/hier/Patch.h"
-#include "SAMRAI/tbox/Pointer.h"
-#include "SAMRAI/pdat/NodeVariable.h"
-#include "SAMRAI/pdat/EdgeVariable.h"
-
-#include <string>
-
-namespace SAMRAI {
-namespace geom {
-
-/**
- * Class Edge_Viscosity_Coarsen implements averaging 
- * for the edge-centered component of the viscosity.
- *
- * The name of this method when specifying it in the input file is
- * "EDGE_VISCOSITY_COARSEN"
- *
- * @see xfer::CoarsenOperator
- */
-
-class Edge_Viscosity_Coarsen:
-   public xfer::CoarsenOperator
-{
-public:
-  /**
-   * Uninteresting default constructor.
-   */
-  explicit Edge_Viscosity_Coarsen(const tbox::Dimension& dim,
-                                  const int &cell_viscosity):
-    xfer::CoarsenOperator(dim, "EDGE_VISCOSITY_COARSEN"),
-    cell_viscosity_id(cell_viscosity)
-  {
-    d_name_id = "EDGE_VISCOSITY_COARSEN";
-  }
-
-  /**
-   * Uninteresting virtual destructor.
-   */
-  virtual ~Edge_Viscosity_Coarsen(){}
-
-  /**
-   * Return true if the variable and name std::string match the edge-centered
-   * double weighted averaging; otherwise, return false.
-   */
-  
-  bool findCoarsenOperator(const tbox::Pointer<hier::Variable>& var,
-                           const std::string& op_name) const
-  {
-    TBOX_DIM_ASSERT_CHECK_ARGS2(*this, *var);
-
-    const tbox::Pointer<pdat::NodeVariable<double> > node_var(var);
-    const tbox::Pointer<pdat::EdgeVariable<double> > edge_var(var);
-    if ((!node_var.isNull() || !edge_var.isNull()) && (op_name == d_name_id)) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Return name std::string identifier of this coarsening operator.
-   */
-  const std::string& getOperatorName() const
-  {
-    return d_name_id;
-  }
-
-  /**
-   * The priority of edge-centered double weighted averaging is 0.
-   * It will be performed before any user-defined coarsen operations.
-   */
-  int getOperatorPriority() const
-  {
-    return 0;
-  }
-
-  /**
-   * The stencil width of the weighted averaging operator is the vector of
-   * zeros.  That is, its stencil does not extend outside the fine box.
-   */
-  hier::IntVector getStencilWidth() const
-  {
-    return hier::IntVector::getZero(getDim());
-  }
-
-  /**
-   * Coarsen the source component on the fine patch to the destination
-   * component on the coarse patch using the edge-centered double weighted
-   * averaging operator.  Coarsening is performed on the intersection of
-   * the destination patch and the coarse box.  It is assumed that the
-   * fine patch contains sufficient data for the stencil width of the
-   * coarsening operator.
-   */
-  void
-  coarsen(
-          hier::Patch& coarse,
-          const hier::Patch& fine,
-          const int dst_component,
-          const int src_component,
-          const hier::Box& coarse_box,
-          const hier::IntVector& ratio) const;
-
-private:
-  std::string d_name_id;
-  int cell_viscosity_id;
-};
-
-}
-}
-#endif
diff -r e4d74f92d629 -r 6d824cc1cdbf src/FACStokes/fix_viscosity.C
--- a/src/FACStokes/fix_viscosity.C	Thu May 05 03:54:22 2011 -0700
+++ b/src/FACStokes/fix_viscosity.C	Thu May 05 03:58:42 2011 -0700
@@ -13,11 +13,6 @@ void SAMRAI::FACStokes::fix_viscosity()
   tbox::Array<tbox::Pointer<xfer::CoarsenSchedule> >
     cell_viscosity_coarsen_schedules;
 
-  tbox::Pointer<xfer::CoarsenOperator> edge_viscosity_coarsen_operator;
-  tbox::Pointer<xfer::CoarsenAlgorithm> edge_viscosity_coarsen_algorithm;
-  tbox::Array<tbox::Pointer<xfer::CoarsenSchedule> >
-    edge_viscosity_coarsen_schedules;
-
   hier::VariableDatabase* vdb = hier::VariableDatabase::getDatabase();
   tbox::Pointer<geom::CartesianGridGeometry> geometry =
     d_hierarchy->getGridGeometry();
@@ -28,19 +23,9 @@ void SAMRAI::FACStokes::fix_viscosity()
                                     "CONSERVATIVE_COARSEN");
                                     // "CELL_VISCOSITY_COARSEN");
 
-  vdb->mapIndexToVariable(edge_viscosity_id, variable);
-  edge_viscosity_coarsen_operator =
-    geometry->lookupCoarsenOperator(variable,
-                                    "EDGE_VISCOSITY_COARSEN");
-
   if (!cell_viscosity_coarsen_operator) {
     TBOX_ERROR(d_object_name
                << ": Cannot find cell viscosity coarsening operator");
-  }
-
-  if (!edge_viscosity_coarsen_operator) {
-    TBOX_ERROR(d_object_name
-               << ": Cannot find edge viscosity coarsening operator");
   }
 
   cell_viscosity_coarsen_schedules.resizeArray(ln_max + 1);
@@ -48,12 +33,6 @@ void SAMRAI::FACStokes::fix_viscosity()
   cell_viscosity_coarsen_algorithm->
     registerCoarsen(cell_viscosity_id,cell_viscosity_id,
                     cell_viscosity_coarsen_operator);
-
-  edge_viscosity_coarsen_schedules.resizeArray(ln_max + 1);
-  edge_viscosity_coarsen_algorithm = new xfer::CoarsenAlgorithm(d_dim);
-  edge_viscosity_coarsen_algorithm->
-    registerCoarsen(edge_viscosity_id,edge_viscosity_id,
-                    edge_viscosity_coarsen_operator);
 
   for (int dest_ln = 0; dest_ln < ln_max; ++dest_ln) {
     cell_viscosity_coarsen_schedules[dest_ln] =
@@ -64,44 +43,21 @@ void SAMRAI::FACStokes::fix_viscosity()
       TBOX_ERROR(d_object_name
                  << ": Cannot create a coarsen schedule for cell viscosity restriction!\n");
     }
-    edge_viscosity_coarsen_schedules[dest_ln] =
-      edge_viscosity_coarsen_algorithm->
-      createSchedule(d_hierarchy->getPatchLevel(dest_ln),
-                     d_hierarchy->getPatchLevel(dest_ln + 1));
-    if (!edge_viscosity_coarsen_schedules[dest_ln]) {
-      TBOX_ERROR(d_object_name
-                 << ": Cannot create a coarsen schedule for edge viscosity restriction!\n");
-    }
   }
 
   for(int dest_ln=ln_max-1; dest_ln>=0; --dest_ln)
     {
-      {
-        xfer::CoarsenAlgorithm coarsener(d_dim);
-        coarsener.registerCoarsen(cell_viscosity_id, cell_viscosity_id,
-                                  cell_viscosity_coarsen_operator);
-        coarsener.resetSchedule(cell_viscosity_coarsen_schedules[dest_ln]);
-        cell_viscosity_coarsen_schedules[dest_ln]->coarsenData();
-        cell_viscosity_coarsen_algorithm->
-          resetSchedule(cell_viscosity_coarsen_schedules[dest_ln]);
-      }
-      {
-        xfer::CoarsenAlgorithm coarsener(d_dim);
-        coarsener.registerCoarsen(edge_viscosity_id, edge_viscosity_id,
-                                  edge_viscosity_coarsen_operator);
-        coarsener.resetSchedule(edge_viscosity_coarsen_schedules[dest_ln]);
-        edge_viscosity_coarsen_schedules[dest_ln]->coarsenData();
-        edge_viscosity_coarsen_algorithm->
-          resetSchedule(edge_viscosity_coarsen_schedules[dest_ln]);
-      }
+      xfer::CoarsenAlgorithm coarsener(d_dim);
+      coarsener.registerCoarsen(cell_viscosity_id, cell_viscosity_id,
+                                cell_viscosity_coarsen_operator);
+      coarsener.resetSchedule(cell_viscosity_coarsen_schedules[dest_ln]);
+      cell_viscosity_coarsen_schedules[dest_ln]->coarsenData();
+      cell_viscosity_coarsen_algorithm->
+        resetSchedule(cell_viscosity_coarsen_schedules[dest_ln]);
     }
 
   cell_viscosity_coarsen_algorithm.setNull();
   cell_viscosity_coarsen_schedules.setNull();
-
-  edge_viscosity_coarsen_algorithm.setNull();
-  edge_viscosity_coarsen_schedules.setNull();
-
 
   /* Compute edge_viscosity by averaging the cell viscosities. */
 
diff -r e4d74f92d629 -r 6d824cc1cdbf src/main.C
--- a/src/main.C	Thu May 05 03:54:22 2011 -0700
+++ b/src/main.C	Thu May 05 03:58:42 2011 -0700
@@ -35,8 +35,6 @@ using namespace std;
 #include "V_Boundary_Refine.h"
 #include "V_Coarsen.h"
 #include "Resid_Coarsen.h"
-#include "Cell_Viscosity_Coarsen.h"
-#include "Edge_Viscosity_Coarsen.h"
 #include "P_MDPI_Refine.h"
 
 #include "FACStokes.h"
@@ -192,14 +190,6 @@ int main(
                          input_db->getDatabase("FACStokes") :
                          tbox::Pointer<tbox::Database>(NULL));
 
-    grid_geometry->addSpatialCoarsenOperator
-      (tbox::Pointer<SAMRAI::xfer::CoarsenOperator>
-       (new SAMRAI::geom::Cell_Viscosity_Coarsen
-        (dim,fac_stokes.edge_viscosity_id)));
-    grid_geometry->addSpatialCoarsenOperator
-      (tbox::Pointer<SAMRAI::xfer::CoarsenOperator>
-       (new SAMRAI::geom::Edge_Viscosity_Coarsen
-        (dim,fac_stokes.cell_viscosity_id)));
     grid_geometry->addSpatialRefineOperator
       (tbox::Pointer<SAMRAI::xfer::RefineOperator>
        (new SAMRAI::geom::P_MDPI_Refine(dim,fac_stokes.v_id,
diff -r e4d74f92d629 -r 6d824cc1cdbf wscript
--- a/wscript	Thu May 05 03:54:22 2011 -0700
+++ b/wscript	Thu May 05 03:58:42 2011 -0700
@@ -33,8 +33,6 @@ def build(bld):
                         'src/V_Boundary_Refine/Update_V_3D.C',
                         'src/V_Coarsen_Patch_Strategy/postprocessCoarsen_2D.C',
                         'src/V_Coarsen_Patch_Strategy/postprocessCoarsen_3D.C',
-                        'src/Cell_Viscosity_Coarsen.C',
-                        'src/Edge_Viscosity_Coarsen.C',
                         'src/set_boundary.C',
                         'src/StokesFACOps/StokesFACOps.C',
                         'src/StokesFACOps/computeCompositeResidualOnLevel.C',



More information about the CIG-COMMITS mailing list