[cig-commits] commit: Setup for checking that P_Refine really does linear interpolation correctly with sinker.input
Mercurial
hg at geodynamics.org
Sun Apr 17 19:42:36 PDT 2011
changeset: 171:4d1857adea3d
user: Walter Landry <wlandry at caltech.edu>
date: Sat Apr 16 19:59:01 2011 -0700
files: FACStokes/initializeLevelData.C input/sinker.input
description:
Setup for checking that P_Refine really does linear interpolation correctly with sinker.input
diff -r 91071fc1be85 -r 4d1857adea3d FACStokes/initializeLevelData.C
--- a/FACStokes/initializeLevelData.C Sat Apr 16 15:27:07 2011 -0700
+++ b/FACStokes/initializeLevelData.C Sat Apr 16 19:59:01 2011 -0700
@@ -57,8 +57,11 @@ void SAMRAI::FACStokes::initializeLevelD
}
// const double inclusion_radius=0.5;
- const double inclusion_viscosity=1e2;
+ const double inclusion_viscosity=1;
const double background_viscosity=1;
+
+ const double background_density(1), block_density(1);
+ // const double background_density(1), block_density(1.03);
static double viscosity[129][129];
static int max_x(0), max_y(0);
@@ -269,18 +272,18 @@ void SAMRAI::FACStokes::initializeLevelD
if(d_dim.getValue()==2)
{
if(x<1.0/3 || x>2.0/3 || y<1.0/3 || y>2.0/3)
- (*v_rhs_data)(s)=1;
+ (*v_rhs_data)(s)=background_density;
else
- (*v_rhs_data)(s)=1.03;
+ (*v_rhs_data)(s)=block_density;
}
else
{
double z=geom->getXLower()[2]
+ geom->getDx()[2]*(s[2]-pbox.lower()[2]);
if(x<1.0/3 || x>2.0/3 || y<1.0/3 || y>2.0/3 || z<1.0/3 || z>2.0/3)
- (*v_rhs_data)(s)=1;
+ (*v_rhs_data)(s)=background_density;
else
- (*v_rhs_data)(s)=1.03;
+ (*v_rhs_data)(s)=block_density;
}
// (*v_rhs_data)(s)=10;
diff -r 91071fc1be85 -r 4d1857adea3d input/sinker.input
--- a/input/sinker.input Sat Apr 16 15:27:07 2011 -0700
+++ b/input/sinker.input Sat Apr 16 19:59:01 2011 -0700
@@ -34,13 +34,13 @@ FACStokes {
enable_logging = TRUE // Bool flag to switch logging on/off
max_cycles = 100 // Max number of FAC cycles to use
residual_tol = 1e-5 // Residual tolerance to solve for
- num_pre_sweeps = 10 // Number of presmoothing sweeps to use
- num_post_sweeps = 10 // Number of postsmoothing sweeps to use
+ num_pre_sweeps = 0 // Number of presmoothing sweeps to use
+ num_post_sweeps = 0 // Number of postsmoothing sweeps to use
smoothing_choice = "Tackley"
coarse_solver_choice = "Tackley"
// smoothing_choice = "Gerya"
// coarse_solver_choice = "Gerya"
- coarse_solver_max_iterations = 25
+ coarse_solver_max_iterations = 250
coarse_solver_tolerance = 1e-8
// p_prolongation_method = "P_MDPI_REFINE"
p_prolongation_method = "P_REFINE"
More information about the CIG-COMMITS
mailing list