Disable direct assembly routines. A more elaborate (and expensive)

scheme is, regrettably, needed for most linear solvers.
This commit is contained in:
Bård Skaflestad 2010-09-09 16:49:16 +00:00
parent c350f18100
commit b04ee86a03
2 changed files with 2 additions and 22 deletions

View File

@ -391,6 +391,7 @@ hybsys_compute_press_flux(int nc, const int *pconn, const int *conn,
} }
#if 0
/* /*
* Routines to assemble global matrix * Routines to assemble global matrix
* *
@ -585,3 +586,4 @@ hybsys_assemble(int nc, int nf,
hybsys_build_matrix_structure(nc, nf, pconn, conn, &A->ia, &A->ja); hybsys_build_matrix_structure(nc, nf, pconn, conn, &A->ia, &A->ja);
hybsys_assemble_global_system(nc, nf, pconn, conn, S, R, &A->sa, b, A->ia); hybsys_assemble_global_system(nc, nf, pconn, conn, S, R, &A->sa, b, A->ia);
} }
#endif

View File

@ -5,10 +5,6 @@
#ifndef HYBSYS_H_INCLUDED #ifndef HYBSYS_H_INCLUDED
#define HYBSYS_H_INCLUDED #define HYBSYS_H_INCLUDED
#ifndef MAT_SIZE_T
#define MAT_SIZE_T int
#endif
struct hybsys { struct hybsys {
double *L; /* C2' * inv(B) * C1 - P */ double *L; /* C2' * inv(B) * C1 - P */
double *F1; /* C1' * inv(B) */ double *F1; /* C1' * inv(B) */
@ -19,18 +15,6 @@ struct hybsys {
}; };
struct Sparse
{
int m;
int n;
MAT_SIZE_T *ia;
MAT_SIZE_T *ja;
double *sa;
};
struct hybsys * struct hybsys *
hybsys_allocate_symm(int max_nconn, int nc, int nconn_tot); hybsys_allocate_symm(int max_nconn, int nc, int nconn_tot);
@ -98,10 +82,4 @@ hybsys_compute_press_flux(int nc, const int *pconn, const int *conn,
const double *pi, double *press, double *flux, const double *pi, double *press, double *flux,
double *work); double *work);
void
hybsys_assemble(int nc, int nf,
const int *pconn, const int *conn,
const double *S, const double *R,
struct Sparse *A, double **b);
#endif /* HYBSYS_H_INCLUDED */ #endif /* HYBSYS_H_INCLUDED */