Changeset 11737

Timestamp:

03/19/12 20:53:40 (13 years ago)

Author:

Eric.Larour

Message:

Vector object does not have an M size.

Location:

issm/trunk-jpl

Files:

• externalpackages/adolc/install.sh (modified) (2 diffs)
• externalpackages/chaco/chaco.patch (modified) (2 diffs)
• externalpackages/matlab/install.sh (modified) (1 diff)
• externalpackages/mitgcm/install.sh (modified) (1 diff)
• externalpackages/petsc/install-2.3.2-macosx64.sh (added)
• src/c/modules/Solverx/Solverx.cpp (modified) (3 diffs)
• src/c/objects/Numerics/Vector.cpp (modified) (1 diff)

issm/trunk-jpl/externalpackages/adolc/install.sh

@@ -1 +1 @@
 #!/bin/bash
+
+#some issues on macosx64 with ISSM's autoconf. you might want to run native to mac on this.
 
 #Some cleanup
@@ -16 +18 @@
 #Compile ADOL-C
 cd src 
+
 ./configure \
         --prefix=$ISSM_TIER/externalpackages/adolc/install \
         --enable-sparse \
         --enable-docexa \
-        --enable-addexa          
+        --enable-addexa \
+        --disable-shave
+
 if [ -z $1 ]; then
         make

issm/trunk-jpl/externalpackages/chaco/chaco.patch

@@ -241 +241 @@
   DEST=         ${DEST_DIR}/chaco
   CC =          gcc
-  IFLAG =               -Imain
+  IFLAG =               -Imain 
 ! #IFLAG =              -Imain -I/usr/local/pkgs/matlab-7.6/extern/include
 ! #CFLAGS =     -O2
@@ -259 +259 @@
   DEST=         ${DEST_DIR}/chaco
   CC =          gcc
-  IFLAG =               -Imain
+  IFLAG =               -Imain -I/usr/include/sys 
 ! CFLAGS =      -O2
 ! OFLAGS =      -O2

issm/trunk-jpl/externalpackages/matlab/install.sh

@@ -1 +1 @@
 #!/bin/bash
-
-#Erase symlink
 rm -rf install
 
-#Select or create a new simlink
-ln -s /usr/local/pkgs/matlab-7.6/ install
-#ln -s /usr/local/matlab704/ install
-#ln -s /usr/local/matlab711/ install
-#ln -s /usr/local/matlab712/ install
-#ln -s /usr/local/pkgs/matlab-7.6/ install
-
-# Macintosh (OSX) simlink 
-#ln -s /Applications/MATLAB_R2008a/ install
-#ln -s /Applications/MATLAB_R2009a.app/ install
-#ln -s /Applications/MATLAB_R2010a.app/ install
-#ln -s /Applications/MATLAB_R2011b.app/ install
-#ln -s /Applications/MATLAB*.app/ install
+ln -s /Applications/MATLAB_R2010a.app/ install

issm/trunk-jpl/externalpackages/mitgcm/install.sh

@@ -15 +15 @@
 
 #Download code from server
+cvs login
 cvs co -P MITgcm
 

issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp

@@ -20 +20 @@
 
         /*output: */
-        Vector *uf=new Vector();
+        Vector *uf=NULL;
 
         /*In debugging mode, check that stiffness matrix and load vectors are not NULL (they can be empty)*/
@@ -29 +29 @@
                 Vec uf0_vector = NULL;
                 Vec df_vector  = NULL;
+                Vec uf_vector  = NULL;
                 if(uf0) uf0_vector = uf0->vector;
                 if(df)  df_vector  = df->vector;
@@ -38 +39 @@
                 #endif
 
-                SolverxPetsc(&uf->vector,Kff->matrix,pf->vector,uf0_vector,df_vector,parameters);
-                if(uf->vector == NULL){
-                        uf->M = 0;
-                }
-                else{
-                        VecGetSize(uf->vector,&uf->M);
-                }
+                SolverxPetsc(&uf_vector,Kff->matrix,pf->vector,uf0_vector,df_vector,parameters);
+
+                /*Create vector out of petsc vector: */
+                uf=new Vector(uf_vector);
         #else
                 #ifdef _HAVE_GSL_

issm/trunk-jpl/src/c/objects/Numerics/Vector.cpp

@@ -79 +79 @@
 Vector::Vector(Vec petsc_vec){
 
-        /*copy vector*/
-        VecDuplicate(petsc_vec,&this->vector);
-        VecCopy(petsc_vec,this->vector);
+        if(petsc_vec==NULL){
+                this->vector=NULL;
+        }
+        else{
+                /*copy vector*/
+                VecDuplicate(petsc_vec,&this->vector);
+                VecCopy(petsc_vec,this->vector);
+        }
 
 }