[cig-commits] commit: minor clean ups

[Mercurial]

changeset:   131:4bfb82142b33
user:        Marc Spiegelman <mspieg at ldeo.columbia.edu>
date:        Mon Apr 21 19:59:48 2008 -0400
files:       src/FieldFunctions.c src/SolitaryWave2DSL.c src/swaves_fieldSplitPC.options
description:
minor clean ups
M   src/FieldFunctions.c
	removed the free flux boundary conditions in the J12 block
M   src/SolitaryWave2DSL.c
	added DMMGSetFromOptions (for new petsc-dev)
M   src/swaves_fieldSplitPC.options
	made consistent with other programs to test


diff -r 88579a7aa65a -r 4bfb82142b33 src/FieldFunctions.c
--- a/src/FieldFunctions.c	Wed Mar 19 12:14:51 2008 -0400
+++ b/src/FieldFunctions.c	Mon Apr 21 19:59:48 2008 -0400
@@ -434,6 +434,11 @@ PetscErrorCode FormJacobianLocal(DALocal
 	  v[7] = -dzdx2*halfNExp*khlfW/phlfW*(x[j][im].cmp-cmpC);     col[7].i = im; col[7].j = j;   col[7].c = 1;
 	  v[8] = -dzdx2*halfNExp*khlfE/phlfE*(x[j][ip].cmp-cmpC);     col[8].i = ip; col[8].j = j;   col[8].c = 1;
 	  v[9] = v[5]+v[6]+v[7]+v[8];                                 col[9].i = i;   col[9].j = j;   col[9].c = 1;
+/* 	  if ( param->zBoundaryFlag == 1 && j == 0 ) { */
+	  if (0) {
+	    v[6] += dz*nExp*khlfN/phlfN;
+	    v[9] += dz*nExp*(khlfN/phlfN-2.*pow(x[j][i].phi,nExp-1));  /*  free flux lower boundary condition */
+	  } 
 	}
       }
 
diff -r 88579a7aa65a -r 4bfb82142b33 src/SolitaryWave2DSL.c
--- a/src/SolitaryWave2DSL.c	Wed Mar 19 12:14:51 2008 -0400
+++ b/src/SolitaryWave2DSL.c	Mon Apr 21 19:59:48 2008 -0400
@@ -153,6 +153,7 @@ int main(int argc,char **argv)
        Set up the SNES solver with callback functions (including local Jacobian)
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
   ierr = DMMGSetSNESLocal(dmmg,FormFunctionLocal,FormJacobianLocal,0,0);CHKERRQ(ierr);
+  ierr = DMMGSetFromOptions(dmmg);CHKERRQ(ierr);
   ierr = DMMGSetInitialGuess(dmmg,FormInitialGuess);CHKERRQ(ierr);
   snes = DMMGGetSNES(dmmg);CHKERRQ(ierr);
 
diff -r 88579a7aa65a -r 4bfb82142b33 src/swaves_fieldSplitPC.options
--- a/src/swaves_fieldSplitPC.options	Wed Mar 19 12:14:51 2008 -0400
+++ b/src/swaves_fieldSplitPC.options	Mon Apr 21 19:59:48 2008 -0400
@@ -1,25 +1,31 @@
 -mglevels 6
--ni_coarse 5
--nj_coarse 5
--width 72
--height 72
+-ni_coarse 4
+-nj_coarse 4
+-width 64
+-height 64
 -dmmg_snes_monitor
 -output_file test
 -log_summary  SolitaryWave2D_summary_FSPC.log  
--amp 3
--z0 36
--cfl 4 
--W0 -7
+-amp 2
+-z0 32
+-cfl 2 
+-W0 -5
 -t_max 1.
 -t_output .5
 -noiseEps .005
 -quiet
--snes_atol 1.e-6
+-snes_atol 1.e-8
+#-ksp_rtol 5.e-3
+-snes_ksp_ew
+-snes_ksp_ew_version 3
 -useFieldSplitPC 
 -fieldsplit_0_mg_levels_ksp_type richardson
 -fieldsplit_0_mg_levels_pc_type sor
 -fieldsplit_0_mg_levels_ksp_max_it 2 
 -fieldsplit_0_pc_mg_smoothdown 2
 -fieldsplit_0_pc_mg_type MULTIPLICATIVE
--ksp_type gmres
+-ksp_type richardson
+#-ksp_monitor
+-snes_converged_reason
 
+