[cig-commits] [commit] rajesh-petsc, rajesh-petsc-schur: cleaned up strip_bcs_from_residual_PETSc function (c09bc23)

Wed Nov 5 19:02:51 PST 2014

Repository : https://github.com/geodynamics/citcoms

On branches: rajesh-petsc,rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

>---------------------------------------------------------------

commit c09bc23bb6170aa0ace78abdfe75625161f76be5
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Aug 20 14:59:40 2014 -0700

    cleaned up strip_bcs_from_residual_PETSc function


>---------------------------------------------------------------

c09bc23bb6170aa0ace78abdfe75625161f76be5
 bin/regional_input.sample | 234 ----------------------------------------------
 lib/Petsc_citcoms.c       |  13 ---
 2 files changed, 247 deletions(-)

diff --git a/bin/regional_input.sample b/bin/regional_input.sample
deleted file mode 100644
index 5c7e236..0000000
--- a/bin/regional_input.sample
+++ /dev/null
@@ -1,234 +0,0 @@
-use_petsc=on
-petsc_schur=on
-
-# specify output files
-datadir="/home/rkk/scratch"
-datafile="regtest"
-
-output_format=ascii
-output_optional=surf,botm
-output_ll_max=20
-
-# specify input files
-# Important: when file_vbcs is 1, make sure topvbc is also turned on.
-file_vbcs=0
-vel_bound_file=""
-#vel_bound_file="velbc/velbc_regional"
-
-coor=0
-coor_file=""
-
-mat_control=0
-mat_file=""
-
-lith_age=0
-lith_age_file=""
-
-tracer=0
-tracer_file=""
-
-
-# processors, mesh grid information
-nproc_surf=1
-nprocx=1
-nprocy=1
-nprocz=1
-nodex=9
-nodey=9
-nodez=9
-mgunitx=4
-mgunity=4
-mgunitz=4
-levels=2
-
-
-# the calculation region definition
-theta_min=1.0708
-theta_max=2.0708
-fi_min=0.0
-fi_max=1.0000
-
-radius_inner=0.5500
-radius_outer=1.0
-
-
-# restart info
-restart=0
-post_p=0
-datadir_old="."
-datafile_old=""
-solution_cycles_init=0
-zero_elapsed_time=1
-
-
-# timestepping information
-minstep=1
-maxstep=1
-maxtotstep=1
-storage_spacing=10
-cpu_limits_in_seconds=360000000
-
-
-# Initial conditions
-num_perturbations=1
-perturblayer=3
-perturbmag=0.1
-perturbl=1
-perturbm=1
-
-
-# Boundary Conditions
-topvbc=0
-     topvbxval=0.0
-     topvbyval=0.0
-botvbc=0
-     botvbxval=0.0
-     botvbyval=0.0
-
-toptbc=1
-     toptbcval=0.0
-bottbc=1
-     bottbcval=1.0
-
-lith_age_time=0
-lith_age_depth=0.031400
-mantle_temp=1.000000
-temperature_bound_adj=0
-depth_bound_adj=0.157000
-width_bound_adj=0.087270
-
-
-# miscellaneous information
-stokes_flow_only=0
-inputdiffusicity=1.0
-rayleigh=1e6
-Q0=0
-
-
-# required information
-Problem=convection
-Geometry=sphere
-Solver=cgrad
-node_assemble=1
-
-
-# Depth Information
-# for material above z_lith,    mat = 1;
-# for material above z_410,     mat = 2;
-# for material above z_lmantle, mat = 3;
-# for material below z_lmantle, mat = 4;
-z_lith=0.0007848
-z_410=0.03924			#also depth of 410-phase change
-z_lmantle=0.06435		#also depth of 670-phase change
-z_cmb=0.439			#     depth of another phase change
-
-
-# Viscosity Information
-rheol=1
-visc_smooth_method=3
-
-VISC_UPDATE=on
-num_mat=4
-
-TDEPV=on
-viscE=30,30,30,30
-viscT=.2,.2,.2,.2
-visc0=10,1,10,10
-
-SDEPV=off
-sdepv_expt=1,1,1,1
-sdepv_misfit=0.020
-
-low_visc_channel=off
-low_visc_wedge=off
-lv_min_radius=0.9764
-lv_max_radius=0.9921
-lv_channel_thickness=0.0047
-lv_reduction=0.5
-
-VMIN=on
-visc_min=1.0e0
-VMAX=on
-visc_max=1.0e1
-
-
-# Tracer information
-tracer=off
-
-tracer_ic_method=0
-tracers_per_element=10
-tracer_file="tracer.dat"
-
-tracer_flavors=0
-ic_method_for_flavors=0
-z_interface=0.700000
-
-chemical_buoyancy=on
-buoy_type=1
-buoyancy_ratio=1.0
-reset_initial_composition=off
-
-
-# Phase Change Information
-Ra_410=0.0
-clapeyron410=0.0235
-transT410=0.78
-width410=0.0058
-
-Ra_670=0.0
-clapeyron670=-0.0235
-transT670=0.875
-width670=0.0058
-
-Ra_cmb=0.0
-clapeyroncmb=-0.0235
-transTcmb=0.875
-widthcmb=0.0058
-
-
-# Dimensional Information
-radius=6371e3
-density=3500.0
-thermdiff=1.0e-6
-gravacc=10.0
-thermexp=3.0e-5
-refvisc=1e21
-cp=1250
-density_above=0.0
-density_below=6600.0
-
-# Data input and program debugging
-DESCRIBE=off
-BEGINNER=off
-VERBOSE=off
-
-verbose=off
-see_convergence=1
-
-
-# Solver Related Matters
-mg_cycle=1
-down_heavy=3
-up_heavy=3
-vlowstep=1000
-vhighstep=3
-
-piterations=375
-accuracy=1.0e-6
-
-ADV=on
-fixed_timestep=0.0
-finetunedt=0.7
-adv_sub_iterations=2
-adv_gamma=0.5
-
-precond=on
-aug_lagr=on
-aug_number=2.0e3
-
-remove_rigid_rotation=on
-
-# Age information
-start_age=4.0
-reset_startage=0
-
diff --git a/lib/Petsc_citcoms.c b/lib/Petsc_citcoms.c
index ae88e66..5bc8746 100644
--- a/lib/Petsc_citcoms.c
+++ b/lib/Petsc_citcoms.c
@@ -135,19 +135,6 @@ void strip_bcs_from_residual_PETSc(
       }
     }
   ierr = VecRestoreArray(Res, &ResData);
-#if 0
-  VecGetOwnershipRange( Res, &low, &high );
- 
-  for( m = 1; m <= E->sphere.caps_per_proc; m++ ) {
-    if( E->num_zero_resid[level][m] ) {
-      for( i = 1; i <= E->num_zero_resid[level][m]; i++ ) {
-	      VecSetValue( Res, E->zero_resid[level][m][i]+low, 0.0, INSERT_VALUES );
-      }
-    }
-  }
-  VecAssemblyBegin( Res );
-  VecAssemblyEnd( Res );
-#endif
 }
 
 PetscErrorCode initial_vel_residual_PETSc( struct All_variables *E,

