[cig-commits] r12995 - in long/3D/Gale/trunk: . python/Gale/packages src/StGermain/compatibility/libpetsc src/StgFEM/SLE/LinearAlgebra/src

[walter at geodynamics.org]

Author: walter
Date: 2008-10-04 11:44:16 -0700 (Sat, 04 Oct 2008)
New Revision: 12995

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/python/Gale/packages/petsc.py
   long/3D/Gale/trunk/src/StGermain/compatibility/libpetsc/petsccompat.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScMGSolver.c
Log:
 r2353 at earth:  boo | 2008-10-04 11:40:53 -0700
 Make Gale work with Petsc 2.3.3



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2352
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2353

Modified: long/3D/Gale/trunk/python/Gale/packages/petsc.py
===================================================================
--- long/3D/Gale/trunk/python/Gale/packages/petsc.py	2008-10-04 18:44:12 UTC (rev 12994)
+++ long/3D/Gale/trunk/python/Gale/packages/petsc.py	2008-10-04 18:44:16 UTC (rev 12995)
@@ -41,7 +41,7 @@
 
     self.logPrint('Checking petsc library in ' + libraryDir)
     testLibraries  = ['petscksp','petscdm','petscmat','petscvec','petsc']
-    testFunction = 'KSPDefaultSMonitor'
+    testFunction = 'KSPCreate'
     foundLibrary=True
     staticLibrary=False
     oldLibs = self.compilers.LIBS

Modified: long/3D/Gale/trunk/src/StGermain/compatibility/libpetsc/petsccompat.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/compatibility/libpetsc/petsccompat.h	2008-10-04 18:44:12 UTC (rev 12994)
+++ long/3D/Gale/trunk/src/StGermain/compatibility/libpetsc/petsccompat.h	2008-10-04 18:44:16 UTC (rev 12995)
@@ -60,6 +60,10 @@
 
 /************************** MODIFICATIONS FOR DESIRED FUNCTIONALITY ******************************************/
 
+#if (( PETSC_VERSION_MAJOR == 2 ) && ( PETSC_VERSION_MINOR == 3 ) && ( PETSC_VERSION_SUBMINOR < 3 ))
+  #define PCMGSetInterpolation(a,b,c)  PCMGSetInterpolate(a,b,c)
+#endif
+
 /* Specific modifications needed for desired functionality: PETSc 2.3.0 and onwards */
 #if (( PETSC_VERSION_MAJOR == 2 ) && ( PETSC_VERSION_MINOR >= 3 )) || ( PETSC_VERSION_MAJOR > 2 )
 	/* PetscLogInfo compatibility between for 2.3.0 and previous -- AlanLo */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScMGSolver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScMGSolver.c	2008-10-04 18:44:12 UTC (rev 12994)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScMGSolver.c	2008-10-04 18:44:16 UTC (rev 12995)
@@ -37,6 +37,7 @@
 #include "StGermain/StGermain.h"
 #include "Discretisation/Discretisation.h"
 #include "LinearAlgebra.h"
+#include <StGermain/compatibility/petsccompat.h>
 
 
 /* Textual name of this class */
@@ -375,7 +376,7 @@
 		assert( Stg_CheckType( rOps[l_i], PETScMatrix ) );
 
 		PETScMGSolver_SetProlongation( self, l_i, pOps[l_i] );
-		ec = PCMGSetInterpolate( pc, l_i, pOps[l_i]->petscMat );
+		ec = PCMGSetInterpolation( pc, l_i, pOps[l_i]->petscMat );
 		CheckPETScError( ec );
 
 		PETScMGSolver_SetRestriction( self, l_i, rOps[l_i] );