Changeset 2241


Ignore:
Timestamp:
09/15/09 15:57:07 (16 years ago)
Author:
Eric.Larour
Message:

News mods to compile on cosmos cluster (linux 32 bits, MPI distributed, not shared).

Location:
issm/trunk
Files:
5 added
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/externalpackages/metis/configs/linux64/Makefile.in.patch

    r1444 r2241  
    113,5c3
    2 < CC = gcc
     2< CC = icc
    33< OBJ_EXT=o
    44< LIB_EXT=a

  • issm/trunk/m4/issm_options.m4

    r2067 r2241  
    628628        if test -n "$VENDOR"; then
    629629
    630                 if  test $VENDOR = intel; then
     630                if  test $VENDOR = intel-win; then
    631631                        export CC=icl
    632632                        export CXX=icl
    633                         export CXXFLAGS="-DWIN32 -D_INTEL_"
     633                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_"
     634                elif test $VENDOR = intel-linux; then
     635                        export CC=icc
     636                        export CXX=icpc
     637                        export CXXFLAGS=" -D_INTEL_LINUX_"
    634638                else
    635639                AC_MSG_ERROR([unknow compiler vendor!])

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

    r2214 r2241  
    66lib_LIBRARIES =
    77else
    8 lib_LIBRARIES = libpISSM.a
     8lib_LIBRARIES = libpISSM.a libOverload.a
    99endif
    1010else
    1111if NOPARALLEL
    12 lib_LIBRARIES = libISSM.a
     12lib_LIBRARIES = libISSM.a  libOverload.a
    1313else
    14 lib_LIBRARIES = libISSM.a libpISSM.a
     14lib_LIBRARIES = libISSM.a libpISSM.a libOverload.a
    1515endif
    1616endif
     17
     18#Overload library, to overload any non-standard symbols.
     19libOverload_a_SOURCES = ./shared/String/stricmp.c
     20libOverload_a_CFLAGS = -fPIC -D_PARALLEL_   -D_C_ $(COPTFLAGS)
    1721
    1822#Serial compilation
    … …  
    619623endif
    620624
    621 LDADD =   ./libpISSM.a $(PETSCLIB)   $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB)
     625LDADD =    ./libpISSM.a $(PETSCLIB)    $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a
    622626
    623627diagnostic_exe_SOURCES = parallel/diagnostic.cpp

  • issm/trunk/src/c/shared/Numerics/isnan.cpp

    r1464 r2241  
    11/*This routine only used by Intel compler: */
    2 #ifdef _INTEL_
     2#ifdef _INTEL_WIN_
    33
    44int isnan(double x){

  • issm/trunk/src/c/shared/Numerics/isnan.h

    r1428 r2241  
    66#define _ISNAN_INTEL_H_
    77
    8 #ifdef _INTEL_
     8#ifdef _INTEL_WIN_
    99int isnan(double X);
    1010#endif
Note: See TracChangeset for help on using the changeset viewer.