Changeset 1061


Ignore:
Timestamp:
06/23/09 09:28:55 (16 years ago)
Author:
Eric.Larour
Message:

Modifications to code and build procedure to accomodate ia64 platform

Location:
issm/trunk/src/c
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r1037 r1061  
    1 INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @PLAPACKINCL@  @BLASLAPACKINCL@ @MUMPSINCL@  @TRIANGLEINCL@
     1INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@
    22
    33#Compile serial library, and then try and compile parallel library
    … …  
    578578endif
    579579
    580 LDADD = ./libpISSM.a $(TRIANGLELIB) $(METISLIB) $(PETSCLIB) $(DAKOTALIB) $(SLEPCLIB) $(MUMPSLIB) $(PLAPACKLIB)  $(MPILIB) $(X_LIBS) -lX11 $(BLASLAPACKLIB) $(SCALAPACKLIB) $(BLACSLIB) $(FLIBS)
     580LDADD = ./libpISSM.a $(METISLIB) $(PETSCLIB) $(DAKOTALIB) $(SLEPCLIB) $(MUMPSLIB) $(PLAPACKLIB)  $(MPILIB) $(X_LIBS) -lX11 $(BLASLAPACKLIB) $(MKLLIB) $(SCALAPACKLIB) $(BLACSLIB) $(FLIBS)
    581581
    582582diagnostic_exe_SOURCES = parallel/diagnostic.cpp

  • issm/trunk/src/c/shared/TriMesh/trimesh.h

    r1 r1061  
    1010#include <math.h>
    1111
    12 #define REAL double
     12//#define REAL double //took  it out because it may conflict with stdlib.h defines. put back if necessary
    1313
    1414int AssociateSegmentToElement(double** psegments,int nseg, double* index,int nel);

  • issm/trunk/src/c/toolkits/petsc/patches/SerialToVec.cpp

    r586 r1061  
    1515
    1616/*Matlab includes: */
     17#ifdef _SERIAL_
    1718#include "mex.h"
     19#endif
    1820
    1921#include "../../../shared/shared.h"
Note: See TracChangeset for help on using the changeset viewer.