MagparWiki: attachment:src_ss12hpc.diff of InstallationOnSolarisSPARC

   1 diff -ru a/Makefile b/Makefile
   2 --- a/Makefile	2008-11-23 08:25:26.000000000 +0100
   3 +++ b/Makefile	2009-09-30 17:28:39.560905107 +0200
   4 @@ -49,7 +49,7 @@
   5  	  r_old2=`echo $$r_old|sed  "s/_mod//"g`; \
   6  	  r_new=""$$r_old2"_mod"; \
   7  	fi; \
   8 -	if [ "$$r_new" == "exported" ]; then \
   9 +	if [ "$$r_new" = "exported" ]; then \
  10  	  r_old2=`echo $$r_old|sed  "s/_mod//"g`; \
  11  	  r_new=""$$r_old2"_mod"; \
  12  	fi; \
  13 diff -ru a/Makefile.in b/Makefile.in
  14 --- a/Makefile.in	2008-12-02 00:23:32.000000000 +0100
  15 +++ b/Makefile.in	2009-10-01 14:39:06.769166662 +0200
  16 @@ -31,7 +31,7 @@
  17  # PETSC #####################################################################
  18  
  19  ifeq ($(PETSC_VERSION),2.3.3)
  20 -  PETSC_ARCH  = PETSc-config-magpar
  21 +  PETSC_ARCH  = solaris2.10-cxx-debug
  22    PETSC_DIR   = $(PD)/petsc-2.3.3-p15
  23    TAO_DIR     = $(PD)/tao-1.9
  24  
  25 @@ -121,7 +121,7 @@
  26  
  27  ifeq ($(SUNDIALS_VERSION),230)
  28    # SUNDIALS version 2.3.0 and later
  29 -  SUNDIALS_DIR   = $(PD)/sundials-2.3.0
  30 +  SUNDIALS_DIR   = $(PD)/sundials
  31    CFLAGS         += -DSUNDIALS_VERSION=$(SUNDIALS_VERSION) -I$(SUNDIALS_DIR)/include
  32  endif
  33  
  34 diff -ru a/Makefile.in.defaults b/Makefile.in.defaults
  35 --- a/Makefile.in.defaults	2008-12-14 06:21:46.000000000 +0100
  36 +++ b/Makefile.in.defaults	2009-10-01 16:30:40.333513122 +0200
  37 @@ -94,7 +94,7 @@
  38  SVNSERVER = 300.300.300.300 # dummy
  39  
  40  # compiler flags ############################################################
  41 -CFLAGS      += -Wunused
  42 +#CFLAGS      += -Wunused
  43  
  44  # Adjust the following variables according to your hardware #################
  45  
  46 @@ -109,7 +109,7 @@
  47  # used during PETSc compilation and then immutable
  48  # use CFLAGS to change compile options later
  49  #
  50 -OPTFLAGS += -O2
  51 +#OPTFLAGS += -O2
  52  #OPTFLAGS += -O3
  53  
  54  # CPU specific compiler options for GCC >= 3.0
  55 diff -ru a/Makefile.in.ss12hpc b/Makefile.in.ss12hpc
  56 --- a/Makefile.in.ss12hpc	2008-12-14 06:21:46.000000000 +0100
  57 +++ b/Makefile.in.ss12hpc	2009-10-01 15:01:18.787939100 +0200
  58 @@ -5,7 +5,7 @@
  59  # default settings ##########################################################
  60  
  61  # magpar home directory
  62 -MAGPAR_HOME = $(HOME)/work/magpar
  63 +MAGPAR_HOME = $(HOME)/magpar-0.8/magpar-0_8
  64  
  65  # directory where the manually compiled libraries are installed
  66  PD = $(MAGPAR_HOME)/libs
  67 @@ -37,7 +37,7 @@
  68  # below in the hardware specific section!
  69  
  70  # select LAPACK version
  71 -liblapack=lapack-3.1.1
  72 +#liblapack=lapack-3.1.1
  73  # FIXME: update to latest version for magpar 0.9
  74  #liblapack=lapack-3.2
  75  
  76 @@ -52,13 +52,13 @@
  77  EXTERNAL_LIB += -L$(METIS_DIR) -lmetis
  78  CFLAGS       += -DMETIS -I$(METIS_DIR)/METISLib
  79  
  80 -PNG_DIR     = $(PD)/libpng-1.2.33
  81 -ZLIB_DIR    = $(PD)/zlib-1.2.3
  82 +#PNG_DIR     = $(PD)/libpng-1.2.33
  83 +#ZLIB_DIR    = $(PD)/zlib-1.2.3
  84  
  85  #DRL: added these, will be used by PETSc,
  86  #rather than assuming they are under $(PD)
  87 -ATLAS_DIR   = $(PD)/atlas/lib
  88 -MPI_DIR     = $(PD)/mpi
  89 +#ATLAS_DIR   = $(PD)/atlas/lib
  90 +#MPI_DIR     = $(PD)/mpi
  91  
  92  ##### use SUPERLU for A*u1=divM (experimental)
  93  #CFLAGS      += -DSUPERLU
  94 @@ -94,7 +94,7 @@
  95  SVNSERVER = 300.300.300.300 # dummy
  96  
  97  # compiler flags ############################################################
  98 -CFLAGS      += -Wunused
  99 +#CFLAGS      += -Wunused
 100  
 101  # Adjust the following variables according to your hardware #################
 102  
 103 @@ -102,14 +102,14 @@
 104  # for your hardware check ATLAS download page for available versions:
 105  # http://sourceforge.net/project/showfiles.php?group_id=23725
 106  #
 107 -libatlas = atlas3.6.0_Linux_PIIISSE1.tar.gz
 108 +#libatlas = atlas3.6.0_Linux_PIIISSE1.tar.gz
 109  
 110  # general optimization options
 111  #
 112  # used during PETSc compilation and then immutable
 113  # use CFLAGS to change compile options later
 114  #
 115 -OPTFLAGS += -O2
 116 +#OPTFLAGS += -O2
 117  #OPTFLAGS += -O3
 118  
 119  # CPU specific compiler options for GCC >= 3.0
 120 diff -ru a/field/hexch_ani.c b/field/hexch_ani.c
 121 --- a/field/hexch_ani.c	2008-12-11 07:06:51.000000000 +0100
 122 +++ b/field/hexch_ani.c	2009-10-01 10:03:06.533793361 +0200
 123 @@ -24,6 +24,7 @@
 124  static char const Id[] = "$Id: hexch_ani.c 2342 2008-12-11 04:34:12Z scholz $\n\n";
 125  static char const Td[] = "$Today: " __FILE__ "  " __DATE__ "  "  __TIME__  " $\n\n";
 126  
 127 +#include <alloca.h>
 128  #include "griddata.h"
 129  #include "init/init.h"
 130  EXTERN_C_BEGIN
 131 @@ -67,7 +67,7 @@
 132      int *p;
 133      p=elevertall;
 134  
 135 -    int recvcount[size];
 136 +    int *recvcount; recvcount = (int*) alloca(size * sizeof(*recvcount));
 137      recvcount[rank]=NV*gdata->ln_ele;
 138      for (int i=0;i<size;i++) {
 139        ierr = MPI_Bcast(recvcount+i,1,MPI_INT,i,PETSC_COMM_WORLD);CHKERRQ(ierr);