← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to paso/src/Solver_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/Solver_Function.c
24
24
{
25
25
    Paso_Function * out=NULL;
26
26
    Paso_SystemMatrix_setPreconditioner(A,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=LINEAR_SYSTEM;
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(A);
33
33
        out->more=(void*)Paso_SystemMatrix_getReference(A);
34
34
        out->b=b;
35
35
        out->tmp=MEMALLOC(out->n, double);
36
 
        Paso_checkPtr(out->tmp);
 
36
        Esys_checkPtr(out->tmp);
37
37
    }
38
 
    if (Paso_noError()) {
 
38
    if (Esys_noError()) {
39
39
        return out;
40
40
    } else {
41
41
        Paso_Function_LinearSystem_free(out);
45
45
void Paso_Function_LinearSystem_free(Paso_Function * F) 
46
46
{
47
47
   if (F!=NULL) {
48
 
       Paso_MPIInfo_free(F->mpi_info);
 
48
       Esys_MPIInfo_free(F->mpi_info);
49
49
       Paso_SystemMatrix_free((Paso_SystemMatrix*)(F->more));
50
50
       MEMFREE(F->tmp);
51
51
       MEMFREE(F);