CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed matrix generation files from hypre_ParCSRMatrix to HYPRE_ParCSRMatrix

Browse Source 
and added definitions to HYPRE_parcsr_ls.h (this is only temporarily)
This commit is contained in:
ulrikey 1999-09-21 20:27:13 +00:00
parent 4935490419
commit 5bd8c1bf62
12 changed files with 76 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
parcsr_linear_solvers/HYPRE_parcsr_ls.h
View File

@ -43,8 +43,11 @@ int HYPRE_ParAMGSolve P((HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParV
int HYPRE_ParAMGSolveT P((HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x ));
int HYPRE_ParAMGSetMaxLevels P((HYPRE_Solver solver , int max_levels ));
int HYPRE_ParAMGSetStrongThreshold P((HYPRE_Solver solver , double strong_threshold ));
int HYPRE_ParAMGSetTruncFactor P((HYPRE_Solver solver , double trunc_factor ));
int HYPRE_ParAMGSetInterpType P((HYPRE_Solver solver , int interp_type ));
int HYPRE_ParAMGSetMaxIter P((HYPRE_Solver solver , int max_iter ));
int HYPRE_ParAMGSetCoarsenType P((HYPRE_Solver solver , int coarsen_type ));
int HYPRE_ParAMGSetMeasureType P((HYPRE_Solver solver , int measure_type ));
int HYPRE_ParAMGSetCycleType P((HYPRE_Solver solver , int cycle_type ));
int HYPRE_ParAMGSetTol P((HYPRE_Solver solver , double tol ));
int HYPRE_ParAMGSetNumGridSweeps P((HYPRE_Solver solver , int *num_grid_sweeps ));
@ -106,6 +109,29 @@ int HYPRE_ParCSRPilutSetMaxIter P((HYPRE_Solver solver , int max_iter ));
int HYPRE_ParCSRPilutSetDropTolerance P((HYPRE_Solver solver , double tol ));
int HYPRE_ParCSRPilutSetFactorRowSize P((HYPRE_Solver solver , int size ));
/* par_laplace.c */
HYPRE_ParCSRMatrix GenerateLaplacian P((MPI_Comm comm , int nx , int ny , int nz
, int P , int Q , int R , int p , int q , int r , double *value ));
int map P((int ix , int iy , int iz , int p , int q , int r , int P , int Q ,
int R , int *nx_part , int *ny_part , int *nz_part , int *global_part ));
/* par_laplace_27pt.c */
HYPRE_ParCSRMatrix GenerateLaplacian27pt P((MPI_Comm comm , int nx , int ny ,
int nz , int P , int Q , int R , int p , int q , int r , double *value ));
int map3 P((int ix , int iy , int iz , int p , int q , int r , int P , int Q ,
int R , int *nx_part , int *ny_part , int *nz_part , int *global_part ));
/* par_laplace_9pt.c */
HYPRE_ParCSRMatrix GenerateLaplacian9pt P((MPI_Comm comm , int nx , int ny , int
P , int Q , int p , int q , double *value ));
int map2 P((int ix , int iy , int p , int q , int P , int Q , int *nx_part , int
*ny_part , int *global_part ));
/* par_difconv.c */
HYPRE_ParCSRMatrix GenerateDifConv P((MPI_Comm comm , int nx , int ny , int nz ,
int P , int Q , int R , int p , int q , int r , double *value ));
#undef P
#undef P
#ifdef __cplusplus

4
parcsr_linear_solvers/par_difconv.c
View File

@ -13,7 +13,7 @@
* hypre_GenerateDifConv
*--------------------------------------------------------------------------*/
hypre_ParCSRMatrix *
HYPRE_ParCSRMatrix
GenerateDifConv( MPI_Comm comm,
int nx,
int ny,
@ -335,6 +335,6 @@ GenerateDifConv( MPI_Comm comm,
hypre_TFree(ny_part);
hypre_TFree(nz_part);
return A;
return (HYPRE_ParCSRMatrix) A;
}

4
parcsr_linear_solvers/par_laplace.c
View File

@ -13,7 +13,7 @@
* hypre_GenerateLaplacian
*--------------------------------------------------------------------------*/
hypre_ParCSRMatrix *
HYPRE_ParCSRMatrix
GenerateLaplacian( MPI_Comm comm,
int nx,
int ny,
@ -335,7 +335,7 @@ GenerateLaplacian( MPI_Comm comm,
hypre_TFree(ny_part);
hypre_TFree(nz_part);
return A;
return (HYPRE_ParCSRMatrix) A;
}
/*--------------------------------------------------------------------------

4
parcsr_linear_solvers/par_laplace_27pt.c
View File

@ -13,7 +13,7 @@
* hypre_GenerateLaplacian27pt
*--------------------------------------------------------------------------*/
hypre_ParCSRMatrix *
HYPRE_ParCSRMatrix
GenerateLaplacian27pt(MPI_Comm comm,
int nx,
int ny,
@ -1645,7 +1645,7 @@ GenerateLaplacian27pt(MPI_Comm comm,
hypre_TFree(ny_part);
hypre_TFree(nz_part);
return A;
return (HYPRE_ParCSRMatrix) A;
}
/*--------------------------------------------------------------------------

4
parcsr_linear_solvers/par_laplace_9pt.c
View File

@ -13,7 +13,7 @@
* hypre_GenerateLaplacian9pt
*--------------------------------------------------------------------------*/
hypre_ParCSRMatrix *
HYPRE_ParCSRMatrix
GenerateLaplacian9pt( MPI_Comm comm,
int nx,
int ny,
@ -469,7 +469,7 @@ GenerateLaplacian9pt( MPI_Comm comm,
hypre_TFree(nx_part);
hypre_TFree(ny_part);
return A;
return (HYPRE_ParCSRMatrix) A;
}
/*--------------------------------------------------------------------------

8
parcsr_linear_solvers/parcsr_linear_solvers.h
View File

@ -260,7 +260,7 @@ int hypre_ParAMGCoarsenFalgout P((hypre_ParCSRMatrix *A , double strength_thresh
int hypre_ParAMGCycle P((void *amg_vdata , hypre_ParVector **F_array , hypre_ParVector **U_array ));
/* par_difconv.c */
hypre_ParCSRMatrix *GenerateDifConv P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
HYPRE_ParCSRMatrix GenerateDifConv P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
/* par_indepset.c */
int hypre_InitParAMGIndepSet P((hypre_ParCSRMatrix *S , double *measure_array ));
@ -270,15 +270,15 @@ int hypre_ParAMGIndepSet P((hypre_ParCSRMatrix *S , hypre_CSRMatrix *S_ext , dou
int hypre_ParAMGBuildInterp P((hypre_ParCSRMatrix *A , int *CF_marker , hypre_ParCSRMatrix *S , int debug_flag , double trunc_factor , hypre_ParCSRMatrix **P_ptr ));
/* par_laplace.c */
hypre_ParCSRMatrix *GenerateLaplacian P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
HYPRE_ParCSRMatrix GenerateLaplacian P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
int map P((int ix , int iy , int iz , int p , int q , int r , int P , int Q , int R , int *nx_part , int *ny_part , int *nz_part , int *global_part ));
/* par_laplace_27pt.c */
hypre_ParCSRMatrix *GenerateLaplacian27pt P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
HYPRE_ParCSRMatrix GenerateLaplacian27pt P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
int map3 P((int ix , int iy , int iz , int p , int q , int r , int P , int Q , int R , int *nx_part , int *ny_part , int *nz_part , int *global_part ));
/* par_laplace_9pt.c */
hypre_ParCSRMatrix *GenerateLaplacian9pt P((MPI_Comm comm , int nx , int ny , int P , int Q , int p , int q , double *value ));
HYPRE_ParCSRMatrix GenerateLaplacian9pt P((MPI_Comm comm , int nx , int ny , int P , int Q , int p , int q , double *value ));
int map2 P((int ix , int iy , int p , int q , int P , int Q , int *nx_part , int *ny_part , int *global_part ));
/* par_rap.c */

26
parcsr_ls/HYPRE_parcsr_ls.h
View File

@ -43,8 +43,11 @@ int HYPRE_ParAMGSolve P((HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParV
int HYPRE_ParAMGSolveT P((HYPRE_Solver solver , HYPRE_ParCSRMatrix A , HYPRE_ParVector b , HYPRE_ParVector x ));
int HYPRE_ParAMGSetMaxLevels P((HYPRE_Solver solver , int max_levels ));
int HYPRE_ParAMGSetStrongThreshold P((HYPRE_Solver solver , double strong_threshold ));
int HYPRE_ParAMGSetTruncFactor P((HYPRE_Solver solver , double trunc_factor ));
int HYPRE_ParAMGSetInterpType P((HYPRE_Solver solver , int interp_type ));
int HYPRE_ParAMGSetMaxIter P((HYPRE_Solver solver , int max_iter ));
int HYPRE_ParAMGSetCoarsenType P((HYPRE_Solver solver , int coarsen_type ));
int HYPRE_ParAMGSetMeasureType P((HYPRE_Solver solver , int measure_type ));
int HYPRE_ParAMGSetCycleType P((HYPRE_Solver solver , int cycle_type ));
int HYPRE_ParAMGSetTol P((HYPRE_Solver solver , double tol ));
int HYPRE_ParAMGSetNumGridSweeps P((HYPRE_Solver solver , int *num_grid_sweeps ));
@ -106,6 +109,29 @@ int HYPRE_ParCSRPilutSetMaxIter P((HYPRE_Solver solver , int max_iter ));
int HYPRE_ParCSRPilutSetDropTolerance P((HYPRE_Solver solver , double tol ));
int HYPRE_ParCSRPilutSetFactorRowSize P((HYPRE_Solver solver , int size ));
/* par_laplace.c */
HYPRE_ParCSRMatrix GenerateLaplacian P((MPI_Comm comm , int nx , int ny , int nz
, int P , int Q , int R , int p , int q , int r , double *value ));
int map P((int ix , int iy , int iz , int p , int q , int r , int P , int Q ,
int R , int *nx_part , int *ny_part , int *nz_part , int *global_part ));
/* par_laplace_27pt.c */
HYPRE_ParCSRMatrix GenerateLaplacian27pt P((MPI_Comm comm , int nx , int ny ,
int nz , int P , int Q , int R , int p , int q , int r , double *value ));
int map3 P((int ix , int iy , int iz , int p , int q , int r , int P , int Q ,
int R , int *nx_part , int *ny_part , int *nz_part , int *global_part ));
/* par_laplace_9pt.c */
HYPRE_ParCSRMatrix GenerateLaplacian9pt P((MPI_Comm comm , int nx , int ny , int
P , int Q , int p , int q , double *value ));
int map2 P((int ix , int iy , int p , int q , int P , int Q , int *nx_part , int
*ny_part , int *global_part ));
/* par_difconv.c */
HYPRE_ParCSRMatrix GenerateDifConv P((MPI_Comm comm , int nx , int ny , int nz ,
int P , int Q , int R , int p , int q , int r , double *value ));
#undef P
#undef P
#ifdef __cplusplus

4
parcsr_ls/par_difconv.c
View File

@ -13,7 +13,7 @@
* hypre_GenerateDifConv
*--------------------------------------------------------------------------*/
hypre_ParCSRMatrix *
HYPRE_ParCSRMatrix
GenerateDifConv( MPI_Comm comm,
int nx,
int ny,
@ -335,6 +335,6 @@ GenerateDifConv( MPI_Comm comm,
hypre_TFree(ny_part);
hypre_TFree(nz_part);
return A;
return (HYPRE_ParCSRMatrix) A;
}

4
parcsr_ls/par_laplace.c
View File

@ -13,7 +13,7 @@
* hypre_GenerateLaplacian
*--------------------------------------------------------------------------*/
hypre_ParCSRMatrix *
HYPRE_ParCSRMatrix
GenerateLaplacian( MPI_Comm comm,
int nx,
int ny,
@ -335,7 +335,7 @@ GenerateLaplacian( MPI_Comm comm,
hypre_TFree(ny_part);
hypre_TFree(nz_part);
return A;
return (HYPRE_ParCSRMatrix) A;
}
/*--------------------------------------------------------------------------

4
parcsr_ls/par_laplace_27pt.c
View File

@ -13,7 +13,7 @@
* hypre_GenerateLaplacian27pt
*--------------------------------------------------------------------------*/
hypre_ParCSRMatrix *
HYPRE_ParCSRMatrix
GenerateLaplacian27pt(MPI_Comm comm,
int nx,
int ny,
@ -1645,7 +1645,7 @@ GenerateLaplacian27pt(MPI_Comm comm,
hypre_TFree(ny_part);
hypre_TFree(nz_part);
return A;
return (HYPRE_ParCSRMatrix) A;
}
/*--------------------------------------------------------------------------

4
parcsr_ls/par_laplace_9pt.c
View File

@ -13,7 +13,7 @@
* hypre_GenerateLaplacian9pt
*--------------------------------------------------------------------------*/
hypre_ParCSRMatrix *
HYPRE_ParCSRMatrix
GenerateLaplacian9pt( MPI_Comm comm,
int nx,
int ny,
@ -469,7 +469,7 @@ GenerateLaplacian9pt( MPI_Comm comm,
hypre_TFree(nx_part);
hypre_TFree(ny_part);
return A;
return (HYPRE_ParCSRMatrix) A;
}
/*--------------------------------------------------------------------------

8
parcsr_ls/parcsr_ls.h
View File

@ -260,7 +260,7 @@ int hypre_ParAMGCoarsenFalgout P((hypre_ParCSRMatrix *A , double strength_thresh
int hypre_ParAMGCycle P((void *amg_vdata , hypre_ParVector **F_array , hypre_ParVector **U_array ));
/* par_difconv.c */
hypre_ParCSRMatrix *GenerateDifConv P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
HYPRE_ParCSRMatrix GenerateDifConv P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
/* par_indepset.c */
int hypre_InitParAMGIndepSet P((hypre_ParCSRMatrix *S , double *measure_array ));
@ -270,15 +270,15 @@ int hypre_ParAMGIndepSet P((hypre_ParCSRMatrix *S , hypre_CSRMatrix *S_ext , dou
int hypre_ParAMGBuildInterp P((hypre_ParCSRMatrix *A , int *CF_marker , hypre_ParCSRMatrix *S , int debug_flag , double trunc_factor , hypre_ParCSRMatrix **P_ptr ));
/* par_laplace.c */
hypre_ParCSRMatrix *GenerateLaplacian P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
HYPRE_ParCSRMatrix GenerateLaplacian P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
int map P((int ix , int iy , int iz , int p , int q , int r , int P , int Q , int R , int *nx_part , int *ny_part , int *nz_part , int *global_part ));
/* par_laplace_27pt.c */
hypre_ParCSRMatrix *GenerateLaplacian27pt P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
HYPRE_ParCSRMatrix GenerateLaplacian27pt P((MPI_Comm comm , int nx , int ny , int nz , int P , int Q , int R , int p , int q , int r , double *value ));
int map3 P((int ix , int iy , int iz , int p , int q , int r , int P , int Q , int R , int *nx_part , int *ny_part , int *nz_part , int *global_part ));
/* par_laplace_9pt.c */
hypre_ParCSRMatrix *GenerateLaplacian9pt P((MPI_Comm comm , int nx , int ny , int P , int Q , int p , int q , double *value ));
HYPRE_ParCSRMatrix GenerateLaplacian9pt P((MPI_Comm comm , int nx , int ny , int P , int Q , int p , int q , double *value ));
int map2 P((int ix , int iy , int p , int q , int P , int Q , int *nx_part , int *ny_part , int *global_part ));
/* par_rap.c */