← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to paso/src/FCTSolver_Function.c

  • Committer: jfenwick
  • Date: 2010-10-11 01:48:14 UTC
  • Revision ID: svn-v4:77569008-7704-0410-b7a0-a92fef0b09fd:trunk:3259
Merging dudley and scons updates from branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
paso/src/FCTSolver_Function.c
24
24
{
25
25
    Paso_Function * out=NULL;
26
26
    Paso_Solver_setPreconditioner(tp->iteration_matrix,options);
27
 
    if (! Paso_noError()) return NULL;
 
27
    if (! Esys_noError()) return NULL;
28
28
    out=MEMALLOC(1,Paso_Function);
29
 
    if (! Paso_checkPtr(out)) {
 
29
    if (! Esys_checkPtr(out)) {
30
30
        out->kind=FCT;
31
 
        out->mpi_info=Paso_MPIInfo_getReference(A->mpi_info);
 
31
        out->mpi_info=Esys_MPIInfo_getReference(A->mpi_info);
32
32
        out->n=Paso_SystemMatrix_getTotalNumRows(fctp->iteration_matrix);
33
33
 
34
34
        out->more=(void*)Paso_SystemMatrix_getReference(A);
35
35
        out->b=NULL;
36
36
        out->tmp=MEMALLOC(out->n, double);
37
 
        Paso_checkPtr(out->tmp);
 
37
        Esys_checkPtr(out->tmp);
38
38
    }
39
 
    if (Paso_noError()) {
 
39
    if (Esys_noError()) {
40
40
        return out;
41
41
    } else {
42
42
        Paso_Function_FCTSolver_free(out);
46
46
void Paso_Function_FCTSolver_free(Paso_Function * F) 
47
47
{
48
48
   if (F!=NULL) {
49
 
       Paso_MPIInfo_free(F->mpi_info);
 
49
       Esys_MPIInfo_free(F->mpi_info);
50
50
       Paso_SystemMatrix_free((Paso_SystemMatrix*)(F->more));
51
51
       MEMFREE(F->tmp);
52
52
       MEMFREE(F);