Ignore:
Timestamp:
09/19/12 09:32:34 (12 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 13393

Location:
issm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src

  • TabularUnified issm/trunk/src/c/solvers/solver_linear.cpp

    r11995 r13395  
    44
    55#include "../toolkits/toolkits.h"
    6 #include "../objects/objects.h"
     6#include "../classes/objects/objects.h"
    77#include "../EnumDefinitions/EnumDefinitions.h"
    88#include "../modules/modules.h"
    … …  
    1111
    1212        /*intermediary: */
    13         Matrix*  Kff = NULL;
    14         Matrix*  Kfs = NULL;
    15         Vector*  ug  = NULL;
    16         Vector*  uf  = NULL;
    17         Vector*  pf  = NULL;
    18         Vector*  df  = NULL;
    19         Vector*  ys  = NULL;
     13        Matrix<IssmDouble>*  Kff = NULL;
     14        Matrix<IssmDouble>*  Kfs = NULL;
     15        Vector<IssmDouble>*  ug  = NULL;
     16        Vector<IssmDouble>*  uf  = NULL;
     17        Vector<IssmDouble>*  pf  = NULL;
     18        Vector<IssmDouble>*  df  = NULL;
     19        Vector<IssmDouble>*  ys  = NULL;
    2020        int  configuration_type;
    2121
    … …  
    2929        Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters);
    3030        xdelete(&Kff); xdelete(&pf); xdelete(&df);
     31//#ifdef  _HAVE_ADOLC_
     32//        for (int i =0; i<uf->svector->M; ++i) {
     33//          ADOLC_DUMP_MACRO(uf->svector->vector[i]);
     34//        }
     35//#endif
    3136        Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);xdelete(&uf); xdelete(&ys);
    3237        InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
Note: See TracChangeset for help on using the changeset viewer.