correct

diff --git a/code/ex15.c b/code/ex15.c
index f62763fbeffe444e57b4582be25f80866de4555e..1fffcbef221d4c25a4fda97db485ed21abf33781 100644 (file)
--- a/code/ex15.c
+++ b/code/ex15.c
@@ -56,7 +56,7 @@ int KrylovMinimize(Mat A, Vec b, Vec x) {
   //Variables
 
   PetscScalar  gamma, alpha, oldgamma, beta;
   //Variables
 
   PetscScalar  gamma, alpha, oldgamma, beta;

-  PetscReal norm=20, Eprecision=1e-8, cgprec=1e-40;     
+  PetscReal norm=20, Eprecision=1e-6, cgprec=1e-40;     

   PetscInt giter=0, ColS=12, col=0, Emaxiter=50000000, iter=0, iterations=15, Iiter=0;
   PetscErrorCode ierr;
   PetscScalar T1, T2;
   PetscInt giter=0, ColS=12, col=0, Emaxiter=50000000, iter=0, iterations=15, Iiter=0;
   PetscErrorCode ierr;
   PetscScalar T1, T2;


@@ -233,7 +233,7 @@ int KrylovMinimizeLSQR(Mat A, Vec b, Vec x) {
   //Variables
 
   PetscScalar  alpha, beta;
   //Variables
 
   PetscScalar  alpha, beta;

-  PetscReal norm=20, Eprecision=1e-8, tol=1e-40;     
+  PetscReal norm=20, Eprecision=1e-6, tol=1e-40;     

   PetscInt giter=0, ColS=12, col=0, Emaxiter=50000000, iter=0, iterations=20, Iiter=0;
   PetscErrorCode ierr;
   PetscScalar T1, T2;
   PetscInt giter=0, ColS=12, col=0, Emaxiter=50000000, iter=0, iterations=20, Iiter=0;
   PetscErrorCode ierr;
   PetscScalar T1, T2;


@@ -310,7 +310,7 @@ int KrylovMinimizeLSQR(Mat A, Vec b, Vec x) {
 
   //Initializations
   //  ierr = KSPGMRESSetRestart(ksp, 16); CHKERRQ(ierr);
 
   //Initializations
   //  ierr = KSPGMRESSetRestart(ksp, 16); CHKERRQ(ierr);

-  ierr = KSPSetTolerances(ksp, 1e-10, 1e-10, PETSC_DEFAULT, 16); CHKERRQ(ierr);
+  ierr = KSPSetTolerances(ksp, 1e-13, 1e-13, PETSC_DEFAULT, 16); CHKERRQ(ierr);

   ierr = KSPSetInitialGuessNonzero(ksp, PETSC_TRUE); CHKERRQ(ierr);
 
 
   ierr = KSPSetInitialGuessNonzero(ksp, PETSC_TRUE); CHKERRQ(ierr);
 
 


@@ -572,7 +572,7 @@ int main(int argc,char **args)
        to set various options.
   */
   ierr = KSPGetPC(ksp,&pc);CHKERRQ(ierr);
        to set various options.
   */
   ierr = KSPGetPC(ksp,&pc);CHKERRQ(ierr);

-  ierr = KSPSetTolerances(ksp,1e-9,1e-9,PETSC_DEFAULT,5000000);CHKERRQ(ierr);
+  ierr = KSPSetTolerances(ksp,1e-7,1e-7,PETSC_DEFAULT,5000000);CHKERRQ(ierr);

 
   /*
     Set runtime options, e.g.,
 
   /*
     Set runtime options, e.g.,

diff --git a/code/ex49.c b/code/ex49.c
index 76f2067f20ed9a181e6fb93d50dd8b0857552f87..260effb9e89fe2f438d89e050e97652e04f3245d 100644 (file)
--- a/code/ex49.c
+++ b/code/ex49.c
@@ -88,7 +88,7 @@ int KrylovMinimize(Mat A, Vec b, Vec x) {
   //Variables
 
   PetscScalar  gamma, alpha, oldgamma, beta;
   //Variables
 
   PetscScalar  gamma, alpha, oldgamma, beta;

-  PetscReal norm=20, Eprecision=1e-8, cgprec=1e-40;     
+  PetscReal norm=20, Eprecision=1e-6, cgprec=1e-40;     

   PetscInt giter=0, ColS=8, col=0, Emaxiter=50000000, iter=0, iterations=15, Iiter=0;
   PetscErrorCode ierr;
   PetscScalar T1, T2;
   PetscInt giter=0, ColS=8, col=0, Emaxiter=50000000, iter=0, iterations=15, Iiter=0;
   PetscErrorCode ierr;
   PetscScalar T1, T2;


@@ -265,7 +265,7 @@ int KrylovMinimizeLSQR(Mat A, Vec b, Vec x) {
   //Variables
 
   PetscScalar  alpha, beta;
   //Variables
 
   PetscScalar  alpha, beta;

-  PetscReal norm=20, Eprecision=1e-8, tol=1e-40;     
+  PetscReal norm=20, Eprecision=1e-6, tol=1e-40;     

   PetscInt giter=0, ColS=8, col=0, Emaxiter=50000000, iter=0, iterations=15, Iiter=0;
   PetscErrorCode ierr;
   PetscScalar T1, T2;
   PetscInt giter=0, ColS=8, col=0, Emaxiter=50000000, iter=0, iterations=15, Iiter=0;
   PetscErrorCode ierr;
   PetscScalar T1, T2;


@@ -1464,12 +1464,12 @@ static PetscErrorCode solve_elasticity_2d(PetscInt mx,PetscInt my)
  ierr = KSPSetFromOptions(ksp_E);CHKERRQ(ierr);
 
    PetscScalar T1,T2;
  ierr = KSPSetFromOptions(ksp_E);CHKERRQ(ierr);
 
    PetscScalar T1,T2;

-    ierr = KSPSetTolerances(ksp_E, 1e-9, 1e-9, PETSC_DEFAULT, 50000000); CHKERRQ(ierr);
-    /*    T1 = MPI_Wtime();
+    ierr = KSPSetTolerances(ksp_E, 1e-7, 1e-7, PETSC_DEFAULT, 50000000); CHKERRQ(ierr);
+    T1 = MPI_Wtime();

 
     ierr = KSPSolve(ksp_E,ff,XX);CHKERRQ(ierr);
     T2 = MPI_Wtime();
 
     ierr = KSPSolve(ksp_E,ff,XX);CHKERRQ(ierr);
     T2 = MPI_Wtime();

-     */
+    

     Mat A;
     Vec sol;
     PetscScalar norm;
     Mat A;
     Vec sol;
     PetscScalar norm;