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

extraneous output variables deleted

Browse Source
This commit is contained in:
vhenson 1997-01-08 21:14:33 +00:00
parent 06947aa508
commit 4f309bd912
22 changed files with 18 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
seq_linear_solvers/amg/amg/amg.c
View File

@ -43,10 +43,6 @@ void *port_data;
/* output params */
int ioutdat;
int ioutgrd;
int ioutmat;
int ioutres;
int ioutsol;
/* log file name */
char *log_file_name;
@ -93,11 +89,7 @@ void *port_data;
iurlx[3] = 9;
/* output params */
ioutdat = 1;
ioutgrd = 0;
ioutmat = 1;
ioutres = 0;
ioutsol = 0;
ioutdat = 3;
/*-----------------------------------------------------------------------
@ -106,7 +98,7 @@ void *port_data;
amg_data = amg_NewData(levmax, ncg, ecg, nwt, ewt, nstr,
ncyc, mu, ntrlx, iprlx, ierlx, iurlx,
ioutdat, ioutgrd, ioutmat, ioutres, ioutsol,
ioutdat,
"amg.out.log");
return (void *)amg_data;

4
seq_linear_solvers/amg/amg/amg.h
View File

@ -62,10 +62,6 @@ void amg_SetIPRLX P((int *iprlx , void *data ));
void amg_SetIERLX P((int *ierlx , void *data ));
void amg_SetIURLX P((int *iurlx , void *data ));
void amg_SetIOutDat P((int ioutdat , void *data ));
void amg_SetIOutGrd P((int ioutgrd , void *data ));
void amg_SetIOutMat P((int ioutmat , void *data ));
void amg_SetIOutRes P((int ioutres , void *data ));
void amg_SetIOutSol P((int ioutsol , void *data ));
void amg_SetLogFileName P((char *log_file_name , void *data ));
void amg_SetNumUnknowns P((int num_unknowns , void *data ));
void amg_SetNumPoints P((int num_points , void *data ));

35
seq_linear_solvers/amg/amg/amg_params.c
View File

@ -152,41 +152,6 @@ void *data;
AMGDataIOutDat(amg_data) = ioutdat;
}
void amg_SetIOutGrd(ioutgrd, data)
int ioutgrd;
void *data;
{
AMGData *amg_data = data;
AMGDataIOutGrd(amg_data) = ioutgrd;
}
void amg_SetIOutMat(ioutmat, data)
int ioutmat;
void *data;
{
AMGData *amg_data = data;
AMGDataIOutMat(amg_data) = ioutmat;
}
void amg_SetIOutRes(ioutres, data)
int ioutres;
void *data;
{
AMGData *amg_data = data;
AMGDataIOutRes(amg_data) = ioutres;
}
void amg_SetIOutSol(ioutsol, data)
int ioutsol;
void *data;
{
AMGData *amg_data = data;
AMGDataIOutSol(amg_data) = ioutsol;
}
/*--------------------------------------------------------------------------

10
seq_linear_solvers/amg/amg/data.c
View File

@ -22,7 +22,7 @@
AMGData *amg_NewData(levmax, ncg, ecg, nwt, ewt, nstr,
ncyc, mu, ntrlx, iprlx, ierlx, iurlx,
ioutdat, ioutgrd, ioutmat, ioutres, ioutsol,
ioutdat,
log_file_name)
int levmax;
int ncg;
@ -37,10 +37,6 @@ int *iprlx;
int *ierlx;
int *iurlx;
int ioutdat;
int ioutgrd;
int ioutmat;
int ioutres;
int ioutsol;
char *log_file_name;
{
AMGData *amg_data;
@ -62,10 +58,6 @@ char *log_file_name;
AMGDataIURLX(amg_data) = iurlx;
AMGDataIOutDat(amg_data) = ioutdat;
AMGDataIOutGrd(amg_data) = ioutgrd;
AMGDataIOutMat(amg_data) = ioutmat;
AMGDataIOutRes(amg_data) = ioutres;
AMGDataIOutSol(amg_data) = ioutsol;
sprintf(AMGDataLogFileName(amg_data), "%s", log_file_name);

8
seq_linear_solvers/amg/amg/data.h
View File

@ -35,10 +35,6 @@ typedef struct
/* output params */
int ioutdat;
int ioutgrd;
int ioutmat;
int ioutres;
int ioutsol;
/* log file name */
char log_file_name[256];
@ -109,10 +105,6 @@ typedef struct
/* output params */
#define AMGDataIOutDat(amg_data) ((amg_data) -> ioutdat)
#define AMGDataIOutGrd(amg_data) ((amg_data) -> ioutgrd)
#define AMGDataIOutMat(amg_data) ((amg_data) -> ioutmat)
#define AMGDataIOutRes(amg_data) ((amg_data) -> ioutres)
#define AMGDataIOutSol(amg_data) ((amg_data) -> ioutsol)
/* log file name */
#define AMGDataLogFileName(amg_data) ((amg_data) -> log_file_name)

27
seq_linear_solvers/amg/amg/f90amg_params.c
View File

@ -121,33 +121,6 @@ int *data;
amg_SetIOutDat(*ioutdat, (void *) *data);
}
void amg_SetIOutGrd_(ioutgrd, data)
int *ioutgrd;
int *data;
{
amg_SetIOutGrd(*ioutgrd, (void *) *data);
}
void amg_SetIOutMat_(ioutmat, data)
int *ioutmat;
int *data;
{
amg_SetIOutMat(*ioutmat, (void *) *data);
}
void amg_SetIOutRes_(ioutres, data)
int *ioutres;
int *data;
{
amg_SetIOutRes(*ioutres, (void *) *data);
}
void amg_SetIOutSol_(ioutsol, data)
int *ioutsol;
int *data;
{
amg_SetIOutSol(*ioutsol, (void *) *data);
}
/*--------------------------------------------------------------------------

6
seq_linear_solvers/amg/amg/protos.h
View File

@ -27,10 +27,6 @@ void amg_SetIPRLX P((int *iprlx , void *data ));
void amg_SetIERLX P((int *ierlx , void *data ));
void amg_SetIURLX P((int *iurlx , void *data ));
void amg_SetIOutDat P((int ioutdat , void *data ));
void amg_SetIOutGrd P((int ioutgrd , void *data ));
void amg_SetIOutMat P((int ioutmat , void *data ));
void amg_SetIOutRes P((int ioutres , void *data ));
void amg_SetIOutSol P((int ioutsol , void *data ));
void amg_SetLogFileName P((char *log_file_name , void *data ));
void amg_SetNumUnknowns P((int num_unknowns , void *data ));
void amg_SetNumPoints P((int num_points , void *data ));
@ -48,7 +44,7 @@ void amg_Setup P((Matrix *A , void *data ));
void amg_Solve P((Vector *u , Vector *f , double tol , void *data ));
/* data.c */
AMGData *amg_NewData P((int levmax , int ncg , double ecg , int nwt , double ewt , int nstr , int ncyc , int *mu , int *ntrlx , int *iprlx , int *ierlx , int *iurlx , int ioutdat , int ioutgrd , int ioutmat , int ioutres , int ioutsol , char *log_file_name ));
AMGData *amg_NewData P((int levmax , int ncg , double ecg , int nwt , double ewt , int nstr , int ncyc , int *mu , int *ntrlx , int *iprlx , int *ierlx , int *iurlx , int ioutdat , char *log_file_name ));
void amg_FreeData P((AMGData *amg_data ));
/* fortran.c */

4
seq_linear_solvers/amg/amgdriver/amg.c
View File

@ -45,10 +45,6 @@ char *log_file_name;
amg_SetIURLX(SolverAMGIURLX(solver), amg_data);
amg_SetIOutDat(SolverAMGIOutDat(solver), amg_data);
amg_SetIOutGrd(SolverAMGIOutGrd(solver), amg_data);
amg_SetIOutMat(SolverAMGIOutMat(solver), amg_data);
amg_SetIOutRes(SolverAMGIOutRes(solver), amg_data);
amg_SetIOutSol(SolverAMGIOutSol(solver), amg_data);
amg_SetLogFileName(log_file_name, amg_data);

6
seq_linear_solvers/amg/amgdriver/default.in.solver
View File

@ -81,9 +81,5 @@
# AMG output data:
# ioutdat; ioutgrd; ioutmat; ioutres
1
0
0
0
0
3

29
seq_linear_solvers/amg/amgdriver/solver.c
View File

@ -55,10 +55,6 @@ char *file_name;
/* amg output params */
int amg_ioutdat;
int amg_ioutgrd;
int amg_ioutmat;
int amg_ioutres;
int amg_ioutsol;
FILE *fp;
int i;
@ -142,10 +138,6 @@ char *file_name;
fscanf(fp, "%d", &amg_iurlx[i]);
fscanf(fp, "%d", &amg_ioutdat);
fscanf(fp, "%d", &amg_ioutgrd);
fscanf(fp, "%d", &amg_ioutmat);
fscanf(fp, "%d", &amg_ioutres);
fscanf(fp, "%d", &amg_ioutsol);
/*----------------------------------------------------------
* Set the solver structure
@ -166,10 +158,6 @@ char *file_name;
SolverAMGIURLX(solver) = amg_iurlx;
SolverAMGIOutDat(solver) = amg_ioutdat;
SolverAMGIOutGrd(solver) = amg_ioutgrd;
SolverAMGIOutMat(solver) = amg_ioutmat;
SolverAMGIOutRes(solver) = amg_ioutres;
SolverAMGIOutSol(solver) = amg_ioutsol;
/*----------------------------------------------------------
* Close the solver file and return
@ -244,10 +232,6 @@ Solver *solver;
/* amg output params */
int amg_ioutdat;
int amg_ioutgrd;
int amg_ioutmat;
int amg_ioutres;
int amg_ioutsol;
int j;
@ -283,10 +267,6 @@ Solver *solver;
amg_iurlx = SolverAMGIURLX(solver);
amg_ioutdat = SolverAMGIOutDat(solver);
amg_ioutgrd = SolverAMGIOutGrd(solver);
amg_ioutmat = SolverAMGIOutMat(solver);
amg_ioutres = SolverAMGIOutRes(solver);
amg_ioutsol = SolverAMGIOutSol(solver);
/*----------------------------------------------------------
* Open the output file
@ -379,7 +359,9 @@ Solver *solver;
fprintf(fp, " Interpolation controls (nwt, ewt): %d %f \n",
amg_nwt, amg_ewt);
fprintf(fp, " Strong connection definition (nstr): %d \n", amg_nstr);
fprintf(fp, " Number and type of cycles (ncyc): %d \n", amg_ncyc);
fprintf(fp, " Number and type of cycles (ncyc): %d \n", amg_ncyc);
fprintf(fp, " Stopping Tolerance %d \n",
stop_tolerance);
fprintf(fp, " W-cycling parameter (mu): ");
for (j = 0; j < 10; j++)
fprintf(fp, "%d ", amg_mu[j]);
@ -395,10 +377,7 @@ Solver *solver;
amg_iurlx[0], amg_iurlx[1], amg_iurlx[2], amg_iurlx[3]);
fprintf(fp, " Output flag (ioutdat): %d \n", amg_ioutdat);
fprintf(fp, " ioutgrd: (unused) %d \n", amg_ioutgrd);
fprintf(fp, " Matrix output flag (ioutmat): %d \n", amg_ioutmat);
fprintf(fp, " Residual report (ioutres): %d \n", amg_ioutres);
fprintf(fp, " Graphical solution flag (ioutsol): %d \n", amg_ioutsol);
}
/*----------------------------------------------------------

8
seq_linear_solvers/amg/amgdriver/solver.h
View File

@ -70,10 +70,6 @@ typedef struct
/* amg output params */
int amg_ioutdat;
int amg_ioutgrd;
int amg_ioutmat;
int amg_ioutres;
int amg_ioutsol;
} Solver;
@ -115,10 +111,6 @@ typedef struct
/* amg output params */
#define SolverAMGIOutDat(solver) ((solver) -> amg_ioutdat)
#define SolverAMGIOutGrd(solver) ((solver) -> amg_ioutgrd)
#define SolverAMGIOutMat(solver) ((solver) -> amg_ioutmat)
#define SolverAMGIOutRes(solver) ((solver) -> amg_ioutres)
#define SolverAMGIOutSol(solver) ((solver) -> amg_ioutsol)
#endif

12
seq_ls/amg/amg/amg.c
View File

@ -43,10 +43,6 @@ void *port_data;
/* output params */
int ioutdat;
int ioutgrd;
int ioutmat;
int ioutres;
int ioutsol;
/* log file name */
char *log_file_name;
@ -93,11 +89,7 @@ void *port_data;
iurlx[3] = 9;
/* output params */
ioutdat = 1;
ioutgrd = 0;
ioutmat = 1;
ioutres = 0;
ioutsol = 0;
ioutdat = 3;
/*-----------------------------------------------------------------------
@ -106,7 +98,7 @@ void *port_data;
amg_data = amg_NewData(levmax, ncg, ecg, nwt, ewt, nstr,
ncyc, mu, ntrlx, iprlx, ierlx, iurlx,
ioutdat, ioutgrd, ioutmat, ioutres, ioutsol,
ioutdat,
"amg.out.log");
return (void *)amg_data;

4
seq_ls/amg/amg/amg.h
View File

@ -62,10 +62,6 @@ void amg_SetIPRLX P((int *iprlx , void *data ));
void amg_SetIERLX P((int *ierlx , void *data ));
void amg_SetIURLX P((int *iurlx , void *data ));
void amg_SetIOutDat P((int ioutdat , void *data ));
void amg_SetIOutGrd P((int ioutgrd , void *data ));
void amg_SetIOutMat P((int ioutmat , void *data ));
void amg_SetIOutRes P((int ioutres , void *data ));
void amg_SetIOutSol P((int ioutsol , void *data ));
void amg_SetLogFileName P((char *log_file_name , void *data ));
void amg_SetNumUnknowns P((int num_unknowns , void *data ));
void amg_SetNumPoints P((int num_points , void *data ));

35
seq_ls/amg/amg/amg_params.c
View File

@ -152,41 +152,6 @@ void *data;
AMGDataIOutDat(amg_data) = ioutdat;
}
void amg_SetIOutGrd(ioutgrd, data)
int ioutgrd;
void *data;
{
AMGData *amg_data = data;
AMGDataIOutGrd(amg_data) = ioutgrd;
}
void amg_SetIOutMat(ioutmat, data)
int ioutmat;
void *data;
{
AMGData *amg_data = data;
AMGDataIOutMat(amg_data) = ioutmat;
}
void amg_SetIOutRes(ioutres, data)
int ioutres;
void *data;
{
AMGData *amg_data = data;
AMGDataIOutRes(amg_data) = ioutres;
}
void amg_SetIOutSol(ioutsol, data)
int ioutsol;
void *data;
{
AMGData *amg_data = data;
AMGDataIOutSol(amg_data) = ioutsol;
}
/*--------------------------------------------------------------------------

10
seq_ls/amg/amg/data.c
View File

@ -22,7 +22,7 @@
AMGData *amg_NewData(levmax, ncg, ecg, nwt, ewt, nstr,
ncyc, mu, ntrlx, iprlx, ierlx, iurlx,
ioutdat, ioutgrd, ioutmat, ioutres, ioutsol,
ioutdat,
log_file_name)
int levmax;
int ncg;
@ -37,10 +37,6 @@ int *iprlx;
int *ierlx;
int *iurlx;
int ioutdat;
int ioutgrd;
int ioutmat;
int ioutres;
int ioutsol;
char *log_file_name;
{
AMGData *amg_data;
@ -62,10 +58,6 @@ char *log_file_name;
AMGDataIURLX(amg_data) = iurlx;
AMGDataIOutDat(amg_data) = ioutdat;
AMGDataIOutGrd(amg_data) = ioutgrd;
AMGDataIOutMat(amg_data) = ioutmat;
AMGDataIOutRes(amg_data) = ioutres;
AMGDataIOutSol(amg_data) = ioutsol;
sprintf(AMGDataLogFileName(amg_data), "%s", log_file_name);

8
seq_ls/amg/amg/data.h
View File

@ -35,10 +35,6 @@ typedef struct
/* output params */
int ioutdat;
int ioutgrd;
int ioutmat;
int ioutres;
int ioutsol;
/* log file name */
char log_file_name[256];
@ -109,10 +105,6 @@ typedef struct
/* output params */
#define AMGDataIOutDat(amg_data) ((amg_data) -> ioutdat)
#define AMGDataIOutGrd(amg_data) ((amg_data) -> ioutgrd)
#define AMGDataIOutMat(amg_data) ((amg_data) -> ioutmat)
#define AMGDataIOutRes(amg_data) ((amg_data) -> ioutres)
#define AMGDataIOutSol(amg_data) ((amg_data) -> ioutsol)
/* log file name */
#define AMGDataLogFileName(amg_data) ((amg_data) -> log_file_name)

27
seq_ls/amg/amg/f90amg_params.c
View File

@ -121,33 +121,6 @@ int *data;
amg_SetIOutDat(*ioutdat, (void *) *data);
}
void amg_SetIOutGrd_(ioutgrd, data)
int *ioutgrd;
int *data;
{
amg_SetIOutGrd(*ioutgrd, (void *) *data);
}
void amg_SetIOutMat_(ioutmat, data)
int *ioutmat;
int *data;
{
amg_SetIOutMat(*ioutmat, (void *) *data);
}
void amg_SetIOutRes_(ioutres, data)
int *ioutres;
int *data;
{
amg_SetIOutRes(*ioutres, (void *) *data);
}
void amg_SetIOutSol_(ioutsol, data)
int *ioutsol;
int *data;
{
amg_SetIOutSol(*ioutsol, (void *) *data);
}
/*--------------------------------------------------------------------------

6
seq_ls/amg/amg/protos.h
View File

@ -27,10 +27,6 @@ void amg_SetIPRLX P((int *iprlx , void *data ));
void amg_SetIERLX P((int *ierlx , void *data ));
void amg_SetIURLX P((int *iurlx , void *data ));
void amg_SetIOutDat P((int ioutdat , void *data ));
void amg_SetIOutGrd P((int ioutgrd , void *data ));
void amg_SetIOutMat P((int ioutmat , void *data ));
void amg_SetIOutRes P((int ioutres , void *data ));
void amg_SetIOutSol P((int ioutsol , void *data ));
void amg_SetLogFileName P((char *log_file_name , void *data ));
void amg_SetNumUnknowns P((int num_unknowns , void *data ));
void amg_SetNumPoints P((int num_points , void *data ));
@ -48,7 +44,7 @@ void amg_Setup P((Matrix *A , void *data ));
void amg_Solve P((Vector *u , Vector *f , double tol , void *data ));
/* data.c */
AMGData *amg_NewData P((int levmax , int ncg , double ecg , int nwt , double ewt , int nstr , int ncyc , int *mu , int *ntrlx , int *iprlx , int *ierlx , int *iurlx , int ioutdat , int ioutgrd , int ioutmat , int ioutres , int ioutsol , char *log_file_name ));
AMGData *amg_NewData P((int levmax , int ncg , double ecg , int nwt , double ewt , int nstr , int ncyc , int *mu , int *ntrlx , int *iprlx , int *ierlx , int *iurlx , int ioutdat , char *log_file_name ));
void amg_FreeData P((AMGData *amg_data ));
/* fortran.c */

4
seq_ls/amg/amgdriver/amg.c
View File

@ -45,10 +45,6 @@ char *log_file_name;
amg_SetIURLX(SolverAMGIURLX(solver), amg_data);
amg_SetIOutDat(SolverAMGIOutDat(solver), amg_data);
amg_SetIOutGrd(SolverAMGIOutGrd(solver), amg_data);
amg_SetIOutMat(SolverAMGIOutMat(solver), amg_data);
amg_SetIOutRes(SolverAMGIOutRes(solver), amg_data);
amg_SetIOutSol(SolverAMGIOutSol(solver), amg_data);
amg_SetLogFileName(log_file_name, amg_data);

6
seq_ls/amg/amgdriver/default.in.solver
View File

@ -81,9 +81,5 @@
# AMG output data:
# ioutdat; ioutgrd; ioutmat; ioutres
1
0
0
0
0
3

29
seq_ls/amg/amgdriver/solver.c
View File

@ -55,10 +55,6 @@ char *file_name;
/* amg output params */
int amg_ioutdat;
int amg_ioutgrd;
int amg_ioutmat;
int amg_ioutres;
int amg_ioutsol;
FILE *fp;
int i;
@ -142,10 +138,6 @@ char *file_name;
fscanf(fp, "%d", &amg_iurlx[i]);
fscanf(fp, "%d", &amg_ioutdat);
fscanf(fp, "%d", &amg_ioutgrd);
fscanf(fp, "%d", &amg_ioutmat);
fscanf(fp, "%d", &amg_ioutres);
fscanf(fp, "%d", &amg_ioutsol);
/*----------------------------------------------------------
* Set the solver structure
@ -166,10 +158,6 @@ char *file_name;
SolverAMGIURLX(solver) = amg_iurlx;
SolverAMGIOutDat(solver) = amg_ioutdat;
SolverAMGIOutGrd(solver) = amg_ioutgrd;
SolverAMGIOutMat(solver) = amg_ioutmat;
SolverAMGIOutRes(solver) = amg_ioutres;
SolverAMGIOutSol(solver) = amg_ioutsol;
/*----------------------------------------------------------
* Close the solver file and return
@ -244,10 +232,6 @@ Solver *solver;
/* amg output params */
int amg_ioutdat;
int amg_ioutgrd;
int amg_ioutmat;
int amg_ioutres;
int amg_ioutsol;
int j;
@ -283,10 +267,6 @@ Solver *solver;
amg_iurlx = SolverAMGIURLX(solver);
amg_ioutdat = SolverAMGIOutDat(solver);
amg_ioutgrd = SolverAMGIOutGrd(solver);
amg_ioutmat = SolverAMGIOutMat(solver);
amg_ioutres = SolverAMGIOutRes(solver);
amg_ioutsol = SolverAMGIOutSol(solver);
/*----------------------------------------------------------
* Open the output file
@ -379,7 +359,9 @@ Solver *solver;
fprintf(fp, " Interpolation controls (nwt, ewt): %d %f \n",
amg_nwt, amg_ewt);
fprintf(fp, " Strong connection definition (nstr): %d \n", amg_nstr);
fprintf(fp, " Number and type of cycles (ncyc): %d \n", amg_ncyc);
fprintf(fp, " Number and type of cycles (ncyc): %d \n", amg_ncyc);
fprintf(fp, " Stopping Tolerance %d \n",
stop_tolerance);
fprintf(fp, " W-cycling parameter (mu): ");
for (j = 0; j < 10; j++)
fprintf(fp, "%d ", amg_mu[j]);
@ -395,10 +377,7 @@ Solver *solver;
amg_iurlx[0], amg_iurlx[1], amg_iurlx[2], amg_iurlx[3]);
fprintf(fp, " Output flag (ioutdat): %d \n", amg_ioutdat);
fprintf(fp, " ioutgrd: (unused) %d \n", amg_ioutgrd);
fprintf(fp, " Matrix output flag (ioutmat): %d \n", amg_ioutmat);
fprintf(fp, " Residual report (ioutres): %d \n", amg_ioutres);
fprintf(fp, " Graphical solution flag (ioutsol): %d \n", amg_ioutsol);
}
/*----------------------------------------------------------

8
seq_ls/amg/amgdriver/solver.h
View File

@ -70,10 +70,6 @@ typedef struct
/* amg output params */
int amg_ioutdat;
int amg_ioutgrd;
int amg_ioutmat;
int amg_ioutres;
int amg_ioutsol;
} Solver;
@ -115,10 +111,6 @@ typedef struct
/* amg output params */
#define SolverAMGIOutDat(solver) ((solver) -> amg_ioutdat)
#define SolverAMGIOutGrd(solver) ((solver) -> amg_ioutgrd)
#define SolverAMGIOutMat(solver) ((solver) -> amg_ioutmat)
#define SolverAMGIOutRes(solver) ((solver) -> amg_ioutres)
#define SolverAMGIOutSol(solver) ((solver) -> amg_ioutsol)
#endif