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

Resolved conflicts;added HYPRE_SStructXXXSetPrintLevel prototypes; and int print_level to structure

Browse Source
This commit is contained in:
castilla 2003-03-01 04:17:15 +00:00
parent 39ec82d753
commit 87ad230111
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sstruct_ls/HYPRE_sstruct_ls.h
View File

@ -135,6 +135,7 @@ int HYPRE_SStructPCGSetPrecond(HYPRE_SStructSolver solver,
int HYPRE_SStructPCGSetLogging(HYPRE_SStructSolver solver,
int logging);
/**
* (Optional) Set the print level.
**/
@ -362,12 +363,21 @@ int HYPRE_SStructGMRESSetLogging(HYPRE_SStructSolver solver,
int logging);
/**
<<<<<<< HYPRE_sstruct_ls.h
* (Optional) It allows printing to the screen when print_level > 0.
**/
int HYPRE_SStructGMRESSetPrintLevel(HYPRE_SStructSolver solver,
int print_level);
/**
=======
* (Optional) Set the print level
**/
int HYPRE_SStructGMRESSetPrintLevel(HYPRE_SStructSolver solver,
int level);
/**
>>>>>>> 2.3
* Return the number of iterations taken.
**/
int HYPRE_SStructGMRESGetNumIterations(HYPRE_SStructSolver solver,
@ -486,6 +496,13 @@ int HYPRE_SStructSysPFMGSetDxyz(HYPRE_SStructSolver solver,
int HYPRE_SStructSysPFMGSetLogging(HYPRE_SStructSolver solver,
int logging);
/**
* (Optional) It allows printing to the screen when print_level > 0.
**/
int HYPRE_SStructSysPFMGSetPrintLevel(HYPRE_SStructSolver solver,
int print_level);
/**
* Return the number of iterations taken.
**/

2
sstruct_ls/sstruct_ls.h
View File

@ -96,6 +96,7 @@ int HYPRE_SStructSysPFMGSetNumPostRelax( HYPRE_SStructSolver solver , int num_po
int HYPRE_SStructSysPFMGSetSkipRelax( HYPRE_SStructSolver solver , int skip_relax );
int HYPRE_SStructSysPFMGSetDxyz( HYPRE_SStructSolver solver , double *dxyz );
int HYPRE_SStructSysPFMGSetLogging( HYPRE_SStructSolver solver , int logging );
int HYPRE_SStructSysPFMGSetPrintLevel( HYPRE_SStructSolver solver , int print_level );
int HYPRE_SStructSysPFMGGetNumIterations( HYPRE_SStructSolver solver , int *num_iterations );
int HYPRE_SStructSysPFMGGetFinalRelativeResidualNorm( HYPRE_SStructSolver solver , double *norm );
@ -146,6 +147,7 @@ int hypre_SysPFMGSetNumPostRelax( void *sys_pfmg_vdata , int num_post_relax );
int hypre_SysPFMGSetSkipRelax( void *sys_pfmg_vdata , int skip_relax );
int hypre_SysPFMGSetDxyz( void *sys_pfmg_vdata , double *dxyz );
int hypre_SysPFMGSetLogging( void *sys_pfmg_vdata , int logging );
int hypre_SysPFMGSetPrintLevel( void *sys_pfmg_vdata , int print_level );
int hypre_SysPFMGGetNumIterations( void *sys_pfmg_vdata , int *num_iterations );
int hypre_SysPFMGPrintLogging( void *sys_pfmg_vdata , int myid );
int hypre_SysPFMGGetFinalRelativeResidualNorm( void *sys_pfmg_vdata , double *relative_residual_norm );

1
sstruct_ls/sys_pfmg.h
View File

@ -63,6 +63,7 @@ typedef struct
/* log info (always logged) */
int num_iterations;
int time_index;
int print_level;
/* additional log info (logged when `logging' > 0) */
int logging;