[cig-commits] commit: Clean up a lot of the sync stuff, getting rid of things that are not needed
Mercurial
hg at geodynamics.org
Fri Apr 22 14:04:58 PDT 2011
changeset: 186:420a836f1cc5
user: Walter Landry <wlandry at caltech.edu>
date: Fri Apr 22 14:03:25 2011 -0700
files: StokesFACOps.h StokesFACOps/StokesFACOps.C StokesFACOps/deallocateOperatorState.C StokesFACOps/initializeOperatorState.C StokesFACOps/xeqScheduleFluxCoarsen.C StokesFACOps/xeqScheduleGhostFill.C StokesFACOps/xeqScheduleGhostFillNoCoarse.C StokesFACOps/xeqScheduleProlongation.C StokesFACOps/xeqScheduleRRestriction.C StokesFACOps/xeqScheduleURestriction.C
description:
Clean up a lot of the sync stuff, getting rid of things that are not needed
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps.h
--- a/StokesFACOps.h Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps.h Fri Apr 22 14:03:25 2011 -0700
@@ -1059,62 +1059,44 @@ private:
//! @brief Error prolongation (refinement) operator.
tbox::Pointer<xfer::RefineOperator> p_prolongation_refine_operator;
- tbox::Pointer<xfer::RefineAlgorithm> p_prolongation_refine_algorithm;
tbox::Array<tbox::Pointer<xfer::RefineSchedule> >
p_prolongation_refine_schedules;
tbox::Pointer<xfer::RefineOperator> v_prolongation_refine_operator;
- tbox::Pointer<xfer::RefineAlgorithm> v_prolongation_refine_algorithm;
tbox::Array<tbox::Pointer<xfer::RefineSchedule> >
v_prolongation_refine_schedules;
//! @brief Solution restriction (coarsening) operator.
tbox::Pointer<xfer::CoarsenOperator> p_urestriction_coarsen_operator;
- tbox::Pointer<xfer::CoarsenAlgorithm> p_urestriction_coarsen_algorithm;
tbox::Array<tbox::Pointer<xfer::CoarsenSchedule> >
p_urestriction_coarsen_schedules;
tbox::Pointer<xfer::CoarsenOperator> v_urestriction_coarsen_operator;
- tbox::Pointer<xfer::CoarsenAlgorithm> v_urestriction_coarsen_algorithm;
tbox::Array<tbox::Pointer<xfer::CoarsenSchedule> >
v_urestriction_coarsen_schedules;
//! @brief Residual restriction (coarsening) operator.
tbox::Pointer<xfer::CoarsenOperator> p_rrestriction_coarsen_operator;
- tbox::Pointer<xfer::CoarsenAlgorithm> p_rrestriction_coarsen_algorithm;
tbox::Array<tbox::Pointer<xfer::CoarsenSchedule> >
p_rrestriction_coarsen_schedules;
tbox::Pointer<xfer::CoarsenOperator> v_rrestriction_coarsen_operator;
- tbox::Pointer<xfer::CoarsenAlgorithm> v_rrestriction_coarsen_algorithm;
tbox::Array<tbox::Pointer<xfer::CoarsenSchedule> >
v_rrestriction_coarsen_schedules;
- //! @brief Coarsen operator for outerflux-to-flux
- tbox::Pointer<xfer::CoarsenOperator> d_flux_coarsen_operator;
- tbox::Pointer<xfer::CoarsenAlgorithm> d_flux_coarsen_algorithm;
- tbox::Array<tbox::Pointer<xfer::CoarsenSchedule> >
- d_flux_coarsen_schedules;
-
//! @brief Refine operator for data from coarser level.
tbox::Pointer<xfer::RefineOperator> p_ghostfill_refine_operator;
- tbox::Pointer<xfer::RefineAlgorithm> p_ghostfill_refine_algorithm;
tbox::Array<tbox::Pointer<xfer::RefineSchedule> >
p_ghostfill_refine_schedules;
tbox::Pointer<xfer::RefineOperator> v_ghostfill_refine_operator;
- tbox::Pointer<xfer::RefineAlgorithm> v_ghostfill_refine_algorithm;
tbox::Array<tbox::Pointer<xfer::RefineSchedule> >
v_ghostfill_refine_schedules;
//! @brief Refine operator for data from same level.
- tbox::Pointer<xfer::RefineOperator> p_nocoarse_refine_operator;
- tbox::Pointer<xfer::RefineAlgorithm> p_nocoarse_refine_algorithm;
tbox::Array<tbox::Pointer<xfer::RefineSchedule> >
p_nocoarse_refine_schedules;
- tbox::Pointer<xfer::RefineOperator> v_nocoarse_refine_operator;
- tbox::Pointer<xfer::RefineAlgorithm> v_nocoarse_refine_algorithm;
tbox::Array<tbox::Pointer<xfer::RefineSchedule> >
v_nocoarse_refine_schedules;
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/StokesFACOps.C
--- a/StokesFACOps/StokesFACOps.C Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps/StokesFACOps.C Fri Apr 22 14:03:25 2011 -0700
@@ -108,37 +108,22 @@ namespace SAMRAI {
d_side_scratch_id(-1),
invalid_id(-1),
p_prolongation_refine_operator(),
- p_prolongation_refine_algorithm(),
p_prolongation_refine_schedules(),
v_prolongation_refine_operator(),
- v_prolongation_refine_algorithm(),
v_prolongation_refine_schedules(),
p_urestriction_coarsen_operator(),
- p_urestriction_coarsen_algorithm(),
p_urestriction_coarsen_schedules(),
v_urestriction_coarsen_operator(),
- v_urestriction_coarsen_algorithm(),
v_urestriction_coarsen_schedules(),
p_rrestriction_coarsen_operator(),
- p_rrestriction_coarsen_algorithm(),
p_rrestriction_coarsen_schedules(),
v_rrestriction_coarsen_operator(),
- v_rrestriction_coarsen_algorithm(),
v_rrestriction_coarsen_schedules(),
- d_flux_coarsen_operator(),
- d_flux_coarsen_algorithm(),
- d_flux_coarsen_schedules(),
p_ghostfill_refine_operator(),
- p_ghostfill_refine_algorithm(),
p_ghostfill_refine_schedules(),
v_ghostfill_refine_operator(),
- v_ghostfill_refine_algorithm(),
v_ghostfill_refine_schedules(),
- p_nocoarse_refine_operator(),
- p_nocoarse_refine_algorithm(),
p_nocoarse_refine_schedules(),
- v_nocoarse_refine_operator(),
- v_nocoarse_refine_algorithm(),
v_nocoarse_refine_schedules(),
p_refine_patch_strategy(dim,
d_object_name + "::refine patch strategy"),
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/deallocateOperatorState.C
--- a/StokesFACOps/deallocateOperatorState.C Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps/deallocateOperatorState.C Fri Apr 22 14:03:25 2011 -0700
@@ -62,39 +62,16 @@ namespace SAMRAI {
d_ln_min = -1;
d_ln_max = -1;
- p_prolongation_refine_algorithm.setNull();
p_prolongation_refine_schedules.setNull();
-
- v_prolongation_refine_algorithm.setNull();
v_prolongation_refine_schedules.setNull();
-
- p_urestriction_coarsen_algorithm.setNull();
p_urestriction_coarsen_schedules.setNull();
-
- v_urestriction_coarsen_algorithm.setNull();
v_urestriction_coarsen_schedules.setNull();
-
- p_rrestriction_coarsen_algorithm.setNull();
p_rrestriction_coarsen_schedules.setNull();
-
- v_rrestriction_coarsen_algorithm.setNull();
v_rrestriction_coarsen_schedules.setNull();
-
- d_flux_coarsen_algorithm.setNull();
- d_flux_coarsen_schedules.setNull();
-
- p_ghostfill_refine_algorithm.setNull();
p_ghostfill_refine_schedules.setNull();
-
- v_ghostfill_refine_algorithm.setNull();
v_ghostfill_refine_schedules.setNull();
-
- p_nocoarse_refine_algorithm.setNull();
p_nocoarse_refine_schedules.setNull();
-
- v_nocoarse_refine_algorithm.setNull();
v_nocoarse_refine_schedules.setNull();
-
}
}
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/initializeOperatorState.C
--- a/StokesFACOps/initializeOperatorState.C Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps/initializeOperatorState.C Fri Apr 22 14:03:25 2011 -0700
@@ -9,37 +9,8 @@
************************************************************************/
#include "StokesFACOps.h"
-#include IOMANIP_HEADER_FILE
-
-#include "SAMRAI/hier/BoundaryBoxUtils.h"
#include "SAMRAI/geom/CartesianGridGeometry.h"
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/hier/Variable.h"
-#include "SAMRAI/hier/VariableDatabase.h"
-#include "SAMRAI/pdat/CellDoubleConstantRefine.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/OutersideData.h"
-#include "SAMRAI/pdat/OutersideVariable.h"
-#include "SAMRAI/hier/PatchData.h"
-#include "SAMRAI/pdat/SideVariable.h"
-#include "SAMRAI/solv/FACPreconditioner.h"
-#include "StokesHypreSolver.h"
-#include "SAMRAI/tbox/Array.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/tbox/StartupShutdownManager.h"
-#include "SAMRAI/tbox/Timer.h"
-#include "SAMRAI/tbox/TimerManager.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/xfer/CoarsenAlgorithm.h"
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/xfer/CoarsenSchedule.h"
-#include "SAMRAI/xfer/RefineAlgorithm.h"
-#include "SAMRAI/xfer/RefineOperator.h"
-#include "SAMRAI/xfer/RefineSchedule.h"
#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
-
/*
************************************************************************
* FACOperatorStrategy virtual initializeOperatorState function. *
@@ -256,16 +227,6 @@ void SAMRAI::solv::StokesFACOps::initial
geometry->lookupRefineOperator(variable,
"V_BOUNDARY_REFINE");
- vdb->mapIndexToVariable(d_cell_scratch_id, variable);
- p_nocoarse_refine_operator =
- geometry->lookupRefineOperator(variable,
- "LINEAR_REFINE");
-
- vdb->mapIndexToVariable(d_side_scratch_id, variable);
- v_nocoarse_refine_operator =
- geometry->lookupRefineOperator(variable,
- "V_REFINE");
-
#ifdef DEBUG_CHECK_ASSERTIONS
if (!p_prolongation_refine_operator) {
TBOX_ERROR(d_object_name
@@ -299,14 +260,6 @@ void SAMRAI::solv::StokesFACOps::initial
TBOX_ERROR(d_object_name
<< ": Cannot find ghost filling refinement operator");
}
- if (!p_nocoarse_refine_operator) {
- TBOX_ERROR(d_object_name
- << ": Cannot find p ghost filling refinement operator");
- }
- if (!v_nocoarse_refine_operator) {
- TBOX_ERROR(d_object_name
- << ": Cannot find v ghost filling refinement operator");
- }
#endif
/*
@@ -325,63 +278,70 @@ void SAMRAI::solv::StokesFACOps::initial
v_urestriction_coarsen_schedules.resizeArray(d_ln_max + 1);
v_rrestriction_coarsen_schedules.resizeArray(d_ln_max + 1);
- p_prolongation_refine_algorithm = new xfer::RefineAlgorithm(d_dim);
- v_prolongation_refine_algorithm = new xfer::RefineAlgorithm(d_dim);
- p_urestriction_coarsen_algorithm = new xfer::CoarsenAlgorithm(d_dim);
- p_rrestriction_coarsen_algorithm = new xfer::CoarsenAlgorithm(d_dim);
- v_urestriction_coarsen_algorithm = new xfer::CoarsenAlgorithm(d_dim);
- v_rrestriction_coarsen_algorithm = new xfer::CoarsenAlgorithm(d_dim);
- p_ghostfill_refine_algorithm = new xfer::RefineAlgorithm(d_dim);
- v_ghostfill_refine_algorithm = new xfer::RefineAlgorithm(d_dim);
- p_nocoarse_refine_algorithm = new xfer::RefineAlgorithm(d_dim);
- v_nocoarse_refine_algorithm = new xfer::RefineAlgorithm(d_dim);
+ xfer::RefineAlgorithm p_prolongation_refine_algorithm(d_dim),
+ v_prolongation_refine_algorithm(d_dim),
+ p_ghostfill_refine_algorithm(d_dim),
+ v_ghostfill_refine_algorithm(d_dim),
+ p_nocoarse_refine_algorithm(d_dim),
+ v_nocoarse_refine_algorithm(d_dim);
+ xfer::CoarsenAlgorithm p_urestriction_coarsen_algorithm(d_dim),
+ p_rrestriction_coarsen_algorithm(d_dim),
+ v_urestriction_coarsen_algorithm(d_dim),
+ v_rrestriction_coarsen_algorithm(d_dim);
- p_prolongation_refine_algorithm->
+ /* This is a little confusing. The only real purpose here is to
+ create a communication schedule. That communication schedule is
+ then reused later when refining, though with a different source,
+ scratch, and destination. So the arguments to registerRefine are
+ not all that important, because a different refineAlgorithm will
+ be used then. */
+
+ p_prolongation_refine_algorithm.
registerRefine(d_cell_scratch_id,
solution.getComponentDescriptorIndex(0),
d_cell_scratch_id,
p_prolongation_refine_operator);
- v_prolongation_refine_algorithm->
+ v_prolongation_refine_algorithm.
registerRefine(d_side_scratch_id,
solution.getComponentDescriptorIndex(1),
d_side_scratch_id,
v_prolongation_refine_operator);
- p_urestriction_coarsen_algorithm->
+ p_urestriction_coarsen_algorithm.
registerCoarsen(solution.getComponentDescriptorIndex(0),
solution.getComponentDescriptorIndex(0),
p_urestriction_coarsen_operator);
- p_rrestriction_coarsen_algorithm->
+ p_rrestriction_coarsen_algorithm.
registerCoarsen(rhs.getComponentDescriptorIndex(0),
rhs.getComponentDescriptorIndex(0),
p_rrestriction_coarsen_operator);
- v_urestriction_coarsen_algorithm->
+ v_urestriction_coarsen_algorithm.
registerCoarsen(solution.getComponentDescriptorIndex(1),
solution.getComponentDescriptorIndex(1),
v_urestriction_coarsen_operator);
- v_rrestriction_coarsen_algorithm->
+ v_rrestriction_coarsen_algorithm.
registerCoarsen(rhs.getComponentDescriptorIndex(1),
rhs.getComponentDescriptorIndex(1),
v_rrestriction_coarsen_operator);
- p_ghostfill_refine_algorithm->
+ p_ghostfill_refine_algorithm.
registerRefine(solution.getComponentDescriptorIndex(0),
solution.getComponentDescriptorIndex(0),
solution.getComponentDescriptorIndex(0),
p_ghostfill_refine_operator);
- v_ghostfill_refine_algorithm->
+ v_ghostfill_refine_algorithm.
registerRefine(solution.getComponentDescriptorIndex(1),
solution.getComponentDescriptorIndex(1),
solution.getComponentDescriptorIndex(1),
v_ghostfill_refine_operator);
- p_nocoarse_refine_algorithm->
+ p_nocoarse_refine_algorithm.
registerRefine(solution.getComponentDescriptorIndex(0),
solution.getComponentDescriptorIndex(0),
solution.getComponentDescriptorIndex(0),
- p_nocoarse_refine_operator);
- v_nocoarse_refine_algorithm->
+ tbox::Pointer<xfer::RefineOperator>(0));
+ v_nocoarse_refine_algorithm.
registerRefine(solution.getComponentDescriptorIndex(1),
solution.getComponentDescriptorIndex(1),
solution.getComponentDescriptorIndex(1),
- v_nocoarse_refine_operator);
+ tbox::Pointer<xfer::RefineOperator>(0));
/* Refinement and ghost fill operators */
for (int dest_ln = d_ln_min + 1; dest_ln <= d_ln_max; ++dest_ln) {
@@ -389,31 +349,29 @@ void SAMRAI::solv::StokesFACOps::initial
tbox::Pointer<xfer::PatchLevelFullFillPattern>
fill_pattern(new xfer::PatchLevelFullFillPattern());
p_prolongation_refine_schedules[dest_ln] =
- p_prolongation_refine_algorithm->
+ p_prolongation_refine_algorithm.
createSchedule(fill_pattern,
d_hierarchy->getPatchLevel(dest_ln),
tbox::Pointer<hier::PatchLevel>(),
dest_ln - 1,
d_hierarchy);
- // &v_refine_patch_strategy);
if (!p_prolongation_refine_schedules[dest_ln]) {
TBOX_ERROR(d_object_name
<< ": Cannot create a refine schedule for p prolongation!\n");
}
v_prolongation_refine_schedules[dest_ln] =
- v_prolongation_refine_algorithm->
+ v_prolongation_refine_algorithm.
createSchedule(fill_pattern,
d_hierarchy->getPatchLevel(dest_ln),
tbox::Pointer<hier::PatchLevel>(),
dest_ln - 1,
d_hierarchy);
- // &v_refine_patch_strategy);
if (!v_prolongation_refine_schedules[dest_ln]) {
TBOX_ERROR(d_object_name
<< ": Cannot create a refine schedule for v prolongation!\n");
}
p_ghostfill_refine_schedules[dest_ln] =
- p_ghostfill_refine_algorithm->
+ p_ghostfill_refine_algorithm.
createSchedule(d_hierarchy->getPatchLevel(dest_ln),
dest_ln - 1,
d_hierarchy,
@@ -423,7 +381,7 @@ void SAMRAI::solv::StokesFACOps::initial
<< ": Cannot create a refine schedule for ghost filling!\n");
}
v_ghostfill_refine_schedules[dest_ln] =
- v_ghostfill_refine_algorithm->
+ v_ghostfill_refine_algorithm.
createSchedule(d_hierarchy->getPatchLevel(dest_ln),
dest_ln - 1,
d_hierarchy,
@@ -433,31 +391,25 @@ void SAMRAI::solv::StokesFACOps::initial
<< ": Cannot create a refine schedule for ghost filling!\n");
}
p_nocoarse_refine_schedules[dest_ln] =
- p_nocoarse_refine_algorithm->
+ p_nocoarse_refine_algorithm.
createSchedule(d_hierarchy->getPatchLevel(dest_ln));
- // &v_refine_patch_strategy);
if (!p_nocoarse_refine_schedules[dest_ln]) {
- TBOX_ERROR(
- d_object_name
- <<
- ": Cannot create a refine schedule for ghost filling on bottom level!\n");
+ TBOX_ERROR(d_object_name
+ << ": Cannot create a refine schedule for ghost filling on bottom level!\n");
}
v_nocoarse_refine_schedules[dest_ln] =
- v_nocoarse_refine_algorithm->
+ v_nocoarse_refine_algorithm.
createSchedule(d_hierarchy->getPatchLevel(dest_ln));
- // &v_refine_patch_strategy);
if (!v_nocoarse_refine_schedules[dest_ln]) {
- TBOX_ERROR(
- d_object_name
- <<
- ": Cannot create a refine schedule for ghost filling on bottom level!\n");
+ TBOX_ERROR(d_object_name
+ << ": Cannot create a refine schedule for ghost filling on bottom level!\n");
}
}
/* Coarsening operators */
for (int dest_ln = d_ln_min; dest_ln < d_ln_max; ++dest_ln) {
p_urestriction_coarsen_schedules[dest_ln] =
- p_urestriction_coarsen_algorithm->
+ p_urestriction_coarsen_algorithm.
createSchedule(d_hierarchy->getPatchLevel(dest_ln),
d_hierarchy->getPatchLevel(dest_ln + 1));
if (!p_urestriction_coarsen_schedules[dest_ln]) {
@@ -465,7 +417,7 @@ void SAMRAI::solv::StokesFACOps::initial
<< ": Cannot create a coarsen schedule for U p restriction!\n");
}
p_rrestriction_coarsen_schedules[dest_ln] =
- p_rrestriction_coarsen_algorithm->
+ p_rrestriction_coarsen_algorithm.
createSchedule(d_hierarchy->getPatchLevel(dest_ln),
d_hierarchy->getPatchLevel(dest_ln + 1));
if (!p_rrestriction_coarsen_schedules[dest_ln]) {
@@ -474,7 +426,7 @@ void SAMRAI::solv::StokesFACOps::initial
}
v_urestriction_coarsen_schedules[dest_ln] =
- v_urestriction_coarsen_algorithm->
+ v_urestriction_coarsen_algorithm.
createSchedule(d_hierarchy->getPatchLevel(dest_ln),
d_hierarchy->getPatchLevel(dest_ln + 1),
&v_coarsen_patch_strategy);
@@ -483,7 +435,7 @@ void SAMRAI::solv::StokesFACOps::initial
<< ": Cannot create a coarsen schedule for U v restriction!\n");
}
v_rrestriction_coarsen_schedules[dest_ln] =
- v_rrestriction_coarsen_algorithm->
+ v_rrestriction_coarsen_algorithm.
createSchedule(d_hierarchy->getPatchLevel(dest_ln),
d_hierarchy->getPatchLevel(dest_ln + 1),
&v_coarsen_patch_strategy);
@@ -495,9 +447,8 @@ void SAMRAI::solv::StokesFACOps::initial
/* Ordinary ghost fill operator on the coarsest level */
p_nocoarse_refine_schedules[d_ln_min] =
- p_nocoarse_refine_algorithm->
+ p_nocoarse_refine_algorithm.
createSchedule(d_hierarchy->getPatchLevel(d_ln_min));
- // &v_refine_patch_strategy);
if (!p_nocoarse_refine_schedules[d_ln_min]) {
TBOX_ERROR(
d_object_name
@@ -505,9 +456,8 @@ void SAMRAI::solv::StokesFACOps::initial
": Cannot create a refine schedule for p ghost filling on bottom level!\n");
}
v_nocoarse_refine_schedules[d_ln_min] =
- v_nocoarse_refine_algorithm->
+ v_nocoarse_refine_algorithm.
createSchedule(d_hierarchy->getPatchLevel(d_ln_min));
- // &v_refine_patch_strategy);
if (!v_nocoarse_refine_schedules[d_ln_min]) {
TBOX_ERROR(
d_object_name
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/xeqScheduleFluxCoarsen.C
--- a/StokesFACOps/xeqScheduleFluxCoarsen.C Fri Apr 22 12:48:03 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +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: Operator class for cell-centered scalar Stokes using FAC
- *
- ************************************************************************/
-#include "StokesFACOps.h"
-
-#include IOMANIP_HEADER_FILE
-
-#include "SAMRAI/hier/BoundaryBoxUtils.h"
-#include "SAMRAI/geom/CartesianGridGeometry.h"
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/hier/Variable.h"
-#include "SAMRAI/hier/VariableDatabase.h"
-#include "SAMRAI/pdat/CellDoubleConstantRefine.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/OutersideData.h"
-#include "SAMRAI/pdat/OutersideVariable.h"
-#include "SAMRAI/hier/PatchData.h"
-#include "SAMRAI/pdat/SideVariable.h"
-#include "SAMRAI/solv/FACPreconditioner.h"
-#include "StokesHypreSolver.h"
-#include "SAMRAI/tbox/Array.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/tbox/StartupShutdownManager.h"
-#include "SAMRAI/tbox/Timer.h"
-#include "SAMRAI/tbox/TimerManager.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/xfer/CoarsenAlgorithm.h"
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/xfer/CoarsenSchedule.h"
-#include "SAMRAI/xfer/RefineAlgorithm.h"
-#include "SAMRAI/xfer/RefineOperator.h"
-#include "SAMRAI/xfer/RefineSchedule.h"
-#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
-
-namespace SAMRAI {
- namespace solv {
-
- void
- StokesFACOps::xeqScheduleFluxCoarsen(
- int dst_id,
- int src_id,
- int dest_ln)
- {
- if (!d_flux_coarsen_schedules[dest_ln]) {
- TBOX_ERROR("Expected schedule not found.");
- }
-
- xfer::CoarsenAlgorithm coarsener(d_dim);
- coarsener.registerCoarsen(dst_id,
- src_id,
- d_flux_coarsen_operator);
-
- coarsener.resetSchedule(d_flux_coarsen_schedules[dest_ln]);
- d_flux_coarsen_schedules[dest_ln]->coarsenData();
- d_flux_coarsen_algorithm->
- resetSchedule(d_flux_coarsen_schedules[dest_ln]);
- }
-
- }
-}
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/xeqScheduleGhostFill.C
--- a/StokesFACOps/xeqScheduleGhostFill.C Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps/xeqScheduleGhostFill.C Fri Apr 22 14:03:25 2011 -0700
@@ -8,37 +8,6 @@
*
************************************************************************/
#include "StokesFACOps.h"
-
-#include IOMANIP_HEADER_FILE
-
-#include "SAMRAI/hier/BoundaryBoxUtils.h"
-#include "SAMRAI/geom/CartesianGridGeometry.h"
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/hier/Variable.h"
-#include "SAMRAI/hier/VariableDatabase.h"
-#include "SAMRAI/pdat/CellDoubleConstantRefine.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/OutersideData.h"
-#include "SAMRAI/pdat/OutersideVariable.h"
-#include "SAMRAI/hier/PatchData.h"
-#include "SAMRAI/pdat/SideVariable.h"
-#include "SAMRAI/solv/FACPreconditioner.h"
-#include "StokesHypreSolver.h"
-#include "SAMRAI/tbox/Array.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/tbox/StartupShutdownManager.h"
-#include "SAMRAI/tbox/Timer.h"
-#include "SAMRAI/tbox/TimerManager.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/xfer/CoarsenAlgorithm.h"
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/xfer/CoarsenSchedule.h"
-#include "SAMRAI/xfer/RefineAlgorithm.h"
-#include "SAMRAI/xfer/RefineOperator.h"
-#include "SAMRAI/xfer/RefineSchedule.h"
-#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
void SAMRAI::solv::StokesFACOps::xeqScheduleGhostFill(int p_id, int v_id,
int dest_ln)
@@ -52,8 +21,6 @@ void SAMRAI::solv::StokesFACOps::xeqSche
refiner.registerRefine(p_id,p_id,p_id,p_ghostfill_refine_operator);
refiner.resetSchedule(p_ghostfill_refine_schedules[dest_ln]);
p_ghostfill_refine_schedules[dest_ln]->fillData(0.0,false);
- p_ghostfill_refine_algorithm->
- resetSchedule(p_ghostfill_refine_schedules[dest_ln]);
}
/* v */
@@ -66,8 +33,6 @@ void SAMRAI::solv::StokesFACOps::xeqSche
refiner.registerRefine(v_id,v_id,v_id,v_ghostfill_refine_operator);
refiner.resetSchedule(v_ghostfill_refine_schedules[dest_ln]);
v_ghostfill_refine_schedules[dest_ln]->fillData(0.0,false);
- v_ghostfill_refine_algorithm->
- resetSchedule(v_ghostfill_refine_schedules[dest_ln]);
}
}
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/xeqScheduleGhostFillNoCoarse.C
--- a/StokesFACOps/xeqScheduleGhostFillNoCoarse.C Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps/xeqScheduleGhostFillNoCoarse.C Fri Apr 22 14:03:25 2011 -0700
@@ -8,37 +8,6 @@
*
************************************************************************/
#include "StokesFACOps.h"
-
-#include IOMANIP_HEADER_FILE
-
-#include "SAMRAI/hier/BoundaryBoxUtils.h"
-#include "SAMRAI/geom/CartesianGridGeometry.h"
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/hier/Variable.h"
-#include "SAMRAI/hier/VariableDatabase.h"
-#include "SAMRAI/pdat/CellDoubleConstantRefine.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/OutersideData.h"
-#include "SAMRAI/pdat/OutersideVariable.h"
-#include "SAMRAI/hier/PatchData.h"
-#include "SAMRAI/pdat/SideVariable.h"
-#include "SAMRAI/solv/FACPreconditioner.h"
-#include "StokesHypreSolver.h"
-#include "SAMRAI/tbox/Array.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/tbox/StartupShutdownManager.h"
-#include "SAMRAI/tbox/Timer.h"
-#include "SAMRAI/tbox/TimerManager.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/xfer/CoarsenAlgorithm.h"
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/xfer/CoarsenSchedule.h"
-#include "SAMRAI/xfer/RefineAlgorithm.h"
-#include "SAMRAI/xfer/RefineOperator.h"
-#include "SAMRAI/xfer/RefineSchedule.h"
-#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
void SAMRAI::solv::StokesFACOps::xeqScheduleGhostFillNoCoarse(int p_id,
int v_id,
@@ -51,11 +20,9 @@ void SAMRAI::solv::StokesFACOps::xeqSche
TBOX_ERROR("Expected cell schedule not found.");
}
xfer::RefineAlgorithm refiner(d_dim);
- refiner.registerRefine(p_id,p_id,p_id,p_nocoarse_refine_operator);
+ refiner.registerRefine(p_id,p_id,p_id,tbox::Pointer<xfer::RefineOperator>(0));
refiner.resetSchedule(p_nocoarse_refine_schedules[dest_ln]);
p_nocoarse_refine_schedules[dest_ln]->fillData(0.0,false);
- p_nocoarse_refine_algorithm->
- resetSchedule(p_nocoarse_refine_schedules[dest_ln]);
}
/* v */
@@ -65,10 +32,8 @@ void SAMRAI::solv::StokesFACOps::xeqSche
TBOX_ERROR("Expected side schedule not found.");
}
xfer::RefineAlgorithm refiner(d_dim);
- refiner.registerRefine(v_id,v_id,v_id,v_nocoarse_refine_operator);
+ refiner.registerRefine(v_id,v_id,v_id,tbox::Pointer<xfer::RefineOperator>(0));
refiner.resetSchedule(v_nocoarse_refine_schedules[dest_ln]);
v_nocoarse_refine_schedules[dest_ln]->fillData(0.0,false);
- v_nocoarse_refine_algorithm->resetSchedule(v_nocoarse_refine_schedules[dest_ln]);
-
}
}
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/xeqScheduleProlongation.C
--- a/StokesFACOps/xeqScheduleProlongation.C Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps/xeqScheduleProlongation.C Fri Apr 22 14:03:25 2011 -0700
@@ -8,37 +8,6 @@
*
************************************************************************/
#include "StokesFACOps.h"
-
-#include IOMANIP_HEADER_FILE
-
-#include "SAMRAI/hier/BoundaryBoxUtils.h"
-#include "SAMRAI/geom/CartesianGridGeometry.h"
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/hier/Variable.h"
-#include "SAMRAI/hier/VariableDatabase.h"
-#include "SAMRAI/pdat/CellDoubleConstantRefine.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/OutersideData.h"
-#include "SAMRAI/pdat/OutersideVariable.h"
-#include "SAMRAI/hier/PatchData.h"
-#include "SAMRAI/pdat/SideVariable.h"
-#include "SAMRAI/solv/FACPreconditioner.h"
-#include "StokesHypreSolver.h"
-#include "SAMRAI/tbox/Array.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/tbox/StartupShutdownManager.h"
-#include "SAMRAI/tbox/Timer.h"
-#include "SAMRAI/tbox/TimerManager.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/xfer/CoarsenAlgorithm.h"
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/xfer/CoarsenSchedule.h"
-#include "SAMRAI/xfer/RefineAlgorithm.h"
-#include "SAMRAI/xfer/RefineOperator.h"
-#include "SAMRAI/xfer/RefineSchedule.h"
-#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
void SAMRAI::solv::StokesFACOps::xeqScheduleProlongation
(int p_dst, int p_src, int p_scr, int v_dst, int v_src, int v_scr,
@@ -53,8 +22,6 @@ void SAMRAI::solv::StokesFACOps::xeqSche
refiner.registerRefine(p_dst, p_src, p_scr, p_prolongation_refine_operator);
refiner.resetSchedule(p_prolongation_refine_schedules[dest_ln]);
p_prolongation_refine_schedules[dest_ln]->fillData(0.0,false);
- p_prolongation_refine_algorithm->
- resetSchedule(p_prolongation_refine_schedules[dest_ln]);
}
/* v */
@@ -66,7 +33,5 @@ void SAMRAI::solv::StokesFACOps::xeqSche
refiner.registerRefine(v_dst, v_src, v_scr, v_prolongation_refine_operator);
refiner.resetSchedule(v_prolongation_refine_schedules[dest_ln]);
v_prolongation_refine_schedules[dest_ln]->fillData(0.0,false);
- v_prolongation_refine_algorithm->
- resetSchedule(v_prolongation_refine_schedules[dest_ln]);
}
}
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/xeqScheduleRRestriction.C
--- a/StokesFACOps/xeqScheduleRRestriction.C Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps/xeqScheduleRRestriction.C Fri Apr 22 14:03:25 2011 -0700
@@ -8,37 +8,6 @@
*
************************************************************************/
#include "StokesFACOps.h"
-
-#include IOMANIP_HEADER_FILE
-
-#include "SAMRAI/hier/BoundaryBoxUtils.h"
-#include "SAMRAI/geom/CartesianGridGeometry.h"
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/hier/Variable.h"
-#include "SAMRAI/hier/VariableDatabase.h"
-#include "SAMRAI/pdat/CellDoubleConstantRefine.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/OutersideData.h"
-#include "SAMRAI/pdat/OutersideVariable.h"
-#include "SAMRAI/hier/PatchData.h"
-#include "SAMRAI/pdat/SideVariable.h"
-#include "SAMRAI/solv/FACPreconditioner.h"
-#include "StokesHypreSolver.h"
-#include "SAMRAI/tbox/Array.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/tbox/StartupShutdownManager.h"
-#include "SAMRAI/tbox/Timer.h"
-#include "SAMRAI/tbox/TimerManager.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/xfer/CoarsenAlgorithm.h"
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/xfer/CoarsenSchedule.h"
-#include "SAMRAI/xfer/RefineAlgorithm.h"
-#include "SAMRAI/xfer/RefineOperator.h"
-#include "SAMRAI/xfer/RefineSchedule.h"
-#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
void SAMRAI::solv::StokesFACOps::xeqScheduleRRestriction(int p_dst, int p_src,
int v_dst, int v_src,
@@ -51,13 +20,9 @@ void SAMRAI::solv::StokesFACOps::xeqSche
}
xfer::CoarsenAlgorithm coarsener(d_dim);
- coarsener.registerCoarsen(p_dst,
- p_src,
- p_rrestriction_coarsen_operator);
+ coarsener.registerCoarsen(p_dst,p_src,p_rrestriction_coarsen_operator);
coarsener.resetSchedule(p_rrestriction_coarsen_schedules[dest_ln]);
p_rrestriction_coarsen_schedules[dest_ln]->coarsenData();
- p_rrestriction_coarsen_algorithm->
- resetSchedule(p_rrestriction_coarsen_schedules[dest_ln]);
}
/* v */
@@ -67,12 +32,8 @@ void SAMRAI::solv::StokesFACOps::xeqSche
}
xfer::CoarsenAlgorithm coarsener(d_dim);
- coarsener.registerCoarsen(v_dst,
- v_src,
- v_rrestriction_coarsen_operator);
+ coarsener.registerCoarsen(v_dst,v_src,v_rrestriction_coarsen_operator);
coarsener.resetSchedule(v_rrestriction_coarsen_schedules[dest_ln]);
v_rrestriction_coarsen_schedules[dest_ln]->coarsenData();
- v_rrestriction_coarsen_algorithm->
- resetSchedule(v_rrestriction_coarsen_schedules[dest_ln]);
}
}
diff -r 6f7a4bd1739d -r 420a836f1cc5 StokesFACOps/xeqScheduleURestriction.C
--- a/StokesFACOps/xeqScheduleURestriction.C Fri Apr 22 12:48:03 2011 -0700
+++ b/StokesFACOps/xeqScheduleURestriction.C Fri Apr 22 14:03:25 2011 -0700
@@ -8,37 +8,6 @@
*
************************************************************************/
#include "StokesFACOps.h"
-
-#include IOMANIP_HEADER_FILE
-
-#include "SAMRAI/hier/BoundaryBoxUtils.h"
-#include "SAMRAI/geom/CartesianGridGeometry.h"
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/hier/Variable.h"
-#include "SAMRAI/hier/VariableDatabase.h"
-#include "SAMRAI/pdat/CellDoubleConstantRefine.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/OutersideData.h"
-#include "SAMRAI/pdat/OutersideVariable.h"
-#include "SAMRAI/hier/PatchData.h"
-#include "SAMRAI/pdat/SideVariable.h"
-#include "SAMRAI/solv/FACPreconditioner.h"
-#include "StokesHypreSolver.h"
-#include "SAMRAI/tbox/Array.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/tbox/StartupShutdownManager.h"
-#include "SAMRAI/tbox/Timer.h"
-#include "SAMRAI/tbox/TimerManager.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/xfer/CoarsenAlgorithm.h"
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/xfer/CoarsenSchedule.h"
-#include "SAMRAI/xfer/RefineAlgorithm.h"
-#include "SAMRAI/xfer/RefineOperator.h"
-#include "SAMRAI/xfer/RefineSchedule.h"
-#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
void SAMRAI::solv::StokesFACOps::xeqScheduleURestriction(int p_dst, int p_src,
int v_dst, int v_src,
@@ -54,8 +23,6 @@ void SAMRAI::solv::StokesFACOps::xeqSche
coarsener.registerCoarsen(p_dst, p_src, p_urestriction_coarsen_operator);
coarsener.resetSchedule(p_urestriction_coarsen_schedules[dest_ln]);
p_urestriction_coarsen_schedules[dest_ln]->coarsenData();
- p_urestriction_coarsen_algorithm->
- resetSchedule(p_urestriction_coarsen_schedules[dest_ln]);
}
/* v */
@@ -68,7 +35,5 @@ void SAMRAI::solv::StokesFACOps::xeqSche
coarsener.registerCoarsen(v_dst, v_src, v_urestriction_coarsen_operator);
coarsener.resetSchedule(v_urestriction_coarsen_schedules[dest_ln]);
v_urestriction_coarsen_schedules[dest_ln]->coarsenData();
- v_urestriction_coarsen_algorithm->
- resetSchedule(v_urestriction_coarsen_schedules[dest_ln]);
}
}
More information about the CIG-COMMITS
mailing list