Changeset 12902


Ignore:
Timestamp:
08/03/12 19:35:30 (13 years ago)
Author:
glperez
Message:

CHG: Refactored SolverxGsl to current SolverxSeq.

Location:
issm/trunk-jpl
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/configure.ac

    r12742 r12902  
    2929# will act simply as a wrapper around AR and Ranlib.
    3030#
    31 #LT_INIT
     31LT_INIT
    3232
    3333#Run issm_options.m4

  • issm/trunk-jpl/src/c/Container/Observations.cpp

    r12726 r12902  
    379379        /*Solve the three linear systems*/
    380380#if _HAVE_GSL_
    381         SolverxGsl(&GinvG0,Gamma,gamma0,n_obs); // Gamma^-1 gamma0
    382         SolverxGsl(&Ginv1, Gamma,ones,n_obs);   // Gamma^-1 ones
    383         SolverxGsl(&GinvZ, Gamma,obs,n_obs);    // Gamma^-1 Z
     381        SolverxSeq(&GinvG0,Gamma,gamma0,n_obs); // Gamma^-1 gamma0
     382        SolverxSeq(&Ginv1, Gamma,ones,n_obs);   // Gamma^-1 ones
     383        SolverxSeq(&GinvZ, Gamma,obs,n_obs);    // Gamma^-1 Z
    384384#else
    385385        _error2_("GSL is required");

  • issm/trunk-jpl/src/c/Makefile.am

    r12862 r12902  
    66lib_LIBRARIES = libISSMCore.a libISSMOverload.a
    77
    8 #if SHARED
    9 #lib_LTLIBRARIES = libISSM.la libISSMCore.la libISSMOverload.la
    10 #endif
     8if SHARED
     9lib_LTLIBRARIES = libISSM.la libISSMCore.la libISSMOverload.la
     10endif
    1111if PYTHON
    1212lib_LIBRARIES += libISSMPython.a
    … …  
    10021002libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
    10031003
    1004 #if SHARED
    1005 #libISSM_la_SOURCES = solutions/issm.cpp
    1006 #libISSM_la_LIBADD = @LTLIBOBJS@
    1007 #libISSM_la_LDFLAGS = -prefer-pic
    1008 
    1009 #libISSMCore_la_SOURCES  = $(issm_sources)
    1010 #libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
    1011 #endif
     1004if SHARED
     1005libISSM_la_SOURCES = solutions/issm.cpp
     1006libISSM_la_LDFLAGS = -prefer-pic
     1007
     1008libISSMCore_la_SOURCES  = $(issm_sources)
     1009libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
     1010endif
    10121011
    10131012if MODULES

  • issm/trunk-jpl/src/c/classes/bamg/macros.h

    r12877 r12902  
    2020        static const short PreviousVertex[3] = {2,0,1};
    2121        const  Icoor1 MaxICoor   = 1073741823; // 2^30-1 =111...111 (29 times one)
    22         const  Icoor2 MaxICoor22 = Icoor2(2)*Icoor2(MaxICoor)*Icoor2(MaxICoor) ;
     22        //const  Icoor2 MaxICoor22 = ((long)(Icoor2(2)*Icoor2(MaxICoor)));
     23    //const  Icoor2 MaxICoor22 = ((long)(Icoor2(2)*Icoor2(MaxICoor)*Icoor2(MaxICoor)));
     24    const  Icoor2 MaxICoor22 = ((unsigned long)(Icoor2(2)*Icoor2(MaxICoor)*Icoor2(MaxICoor)));
    2325}
    2426

  • issm/trunk-jpl/src/c/classes/bamg/typedefs.h

    r12876 r12902  
    88        /*Integer coordinates types*/
    99        typedef int  Icoor1;
    10         typedef long Icoor2;
     10        typedef unsigned long Icoor2;
    1111
    1212        /*I2 and R2*/
Note: See TracChangeset for help on using the changeset viewer.