[cig-commits] commit: Fix for Petsc 3.2

Mercurial hg at geodynamics.org
Thu Mar 15 12:36:15 PDT 2012


changeset:   924:613b95ba2683
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu Mar 15 12:36:02 2012 -0700
files:       Rheology/tests/ViscousSuite.cxx
description:
Fix for Petsc 3.2


diff -r 1381d93b2f6f -r 613b95ba2683 Rheology/tests/ViscousSuite.cxx
--- a/Rheology/tests/ViscousSuite.cxx	Thu Mar 15 12:35:49 2012 -0700
+++ b/Rheology/tests/ViscousSuite.cxx	Thu Mar 15 12:36:02 2012 -0700
@@ -73,7 +73,7 @@ void ViscousSuite_ArrheniusStiffnessMatr
 	pcu_filename_expected( filename, expected_file );
 	PetscViewerBinaryOpen( context->communicator, expected_file, FILE_MODE_READ, &expViewer );
 
-	MatLoad( expViewer, MATAIJ, &expected );
+	MatLoad( expected, expViewer );
 
 	/* 
 		 To view the expected and computed matricies uncomment this
@@ -101,8 +101,8 @@ void ViscousSuite_ArrheniusStiffnessMatr
 		if( err == -1 ) printf("Error in %s, can't delete the input.xml\n", __func__);
 	}
 
-   PetscViewerDestroy( expViewer );
-   MatDestroy( expected);
+   PetscViewerDestroy( &expViewer );
+   MatDestroy( &expected);
 	stgMainDestroy( cf );
 }
 
@@ -155,7 +155,7 @@ void ViscousSuite_FrankKamenetskiiStiffn
 	pcu_filename_expected( filename, expected_file );
 	PetscViewerBinaryOpen( context->communicator, expected_file, FILE_MODE_READ, &expViewer );
 
-	MatLoad( expViewer, MATAIJ, &expected );
+	MatLoad( expected, expViewer );
 
 	/* 
 		 To view the expected and computed matricies uncomment this
@@ -183,8 +183,8 @@ void ViscousSuite_FrankKamenetskiiStiffn
 		if( err == -1 ) printf("Error in %s, can't delete the input.xml\n", __func__);
 	}
 
-   PetscViewerDestroy( expViewer );
-   MatDestroy( expected);
+   PetscViewerDestroy( &expViewer );
+   MatDestroy( &expected);
 	stgMainDestroy( cf );
 }
 
@@ -237,7 +237,7 @@ void ViscousSuite_MaterialViscosityStiff
 	pcu_filename_expected( filename, expected_file );
 	PetscViewerBinaryOpen( context->communicator, expected_file, FILE_MODE_READ, &expViewer );
 
-	MatLoad( expViewer, MATAIJ, &expected );
+	MatLoad( expected, expViewer );
 	/* 
 		 To view the expected and computed matricies uncomment this
 	PetscViewerASCIIOpen(context->communicator, "numerical.dat",&currViewer);
@@ -264,8 +264,8 @@ void ViscousSuite_MaterialViscosityStiff
 		if( err == -1 ) printf("Error in %s, can't delete the input.xml\n", __func__);
 	}
 
-   PetscViewerDestroy( expViewer );
-   MatDestroy( expected);
+   PetscViewerDestroy( &expViewer );
+   MatDestroy( &expected);
 	stgMainDestroy( cf );
 }
 
@@ -318,7 +318,7 @@ void ViscousSuite_ArrheniusStiffnessMatr
 	pcu_filename_expected( filename, expected_file );
 	PetscViewerBinaryOpen( context->communicator, expected_file, FILE_MODE_READ, &expViewer );
 
-	MatLoad( expViewer, MATAIJ, &expected );
+	MatLoad( expected, expViewer );
 
 	/* 
 		 To view the expected and computed matricies uncomment this
@@ -346,8 +346,8 @@ void ViscousSuite_ArrheniusStiffnessMatr
 		if( err == -1 ) printf("Error in %s, can't delete the input.xml\n", __func__);
 	}
 
-   PetscViewerDestroy( expViewer );
-   MatDestroy( expected);
+   PetscViewerDestroy( &expViewer );
+   MatDestroy( &expected);
 	stgMainDestroy( cf );
 }
 
@@ -400,7 +400,7 @@ void ViscousSuite_FrankKamenetskiiStiffn
 	pcu_filename_expected( filename, expected_file );
 	PetscViewerBinaryOpen( context->communicator, expected_file, FILE_MODE_READ, &expViewer );
 
-	MatLoad( expViewer, MATAIJ, &expected );
+	MatLoad( expected, expViewer );
 
 	/* 
 		 To view the expected and computed matricies uncomment this
@@ -428,8 +428,8 @@ void ViscousSuite_FrankKamenetskiiStiffn
 		if( err == -1 ) printf("Error in %s, can't delete the input.xml\n", __func__);
 	}
 
-   PetscViewerDestroy( expViewer );
-   MatDestroy( expected);
+   PetscViewerDestroy( &expViewer );
+   MatDestroy( &expected);
 	stgMainDestroy( cf );
 }
 



More information about the CIG-COMMITS mailing list