Changeset 18978

Timestamp:

01/05/15 15:05:24 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: switching to new compiler and new mpi

Location:

issm/trunk-jpl

Files:

• configs/config-linux64-pleiades-intel2015.0.090-mpt.2.11r13.sh (modified) (2 diffs)
• externalpackages/gslib/install.sh (modified) (1 diff)
• src/c/solutionsequences/solutionsequence_fct.cpp (modified) (5 diffs)

issm/trunk-jpl/configs/config-linux64-pleiades-intel2015.0.090-mpt.2.11r13.sh

@@ -3 +3 @@
         --prefix=$ISSM_DIR \
         --without-kriging \
-        --with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
+        --with-wrappers=no \
         --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
         --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
@@ -12 +12 @@
         --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install" \
         --with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-hypre-dir="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-graphics-lib="/usr/lib64/libX11.so" \
-        --with-cxxoptflags="-g -O2" \
+        --with-cxxoptflags="-O3 -axAVX" \
         --with-vendor="intel-pleiades"

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

@@ -18 +18 @@
 #Change compiler to gfortran
 cd install
-cat Makefile | sed -e "s/FC=g95/FC=gfortran/g" > Makefile.bak
+cat Makefile | sed -e "s/FC=g95/FC=ifort/g" > Makefile.bak
 mv Makefile.bak Makefile
-cat gslib/Makefile | sed -e "s/FC=g95/FC=gfortran/g" > Makefile.bak
+cat gslib/Makefile | sed -e "s/FC=g95/FC=ifort/g" > Makefile.bak
 mv Makefile.bak gslib/Makefile
 make 

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp

@@ -44 +44 @@
                         _assert_(cols[j]==cols2[j]);
                         d = max(max(-vals[j],-vals2[j]),0.);
-                        MatSetValue(D,row,cols[j],(const double)d,INSERT_VALUES);
+                        MatSetValue(D,row,cols[j],d,INSERT_VALUES);
                         if(cols[j]!=row) diagD -= d;
                 }
-                MatSetValue(D,row,row,(const double)diagD,INSERT_VALUES);
+                MatSetValue(D,row,row,diagD,INSERT_VALUES);
                 MatRestoreRow(K       ,row,&ncols, (const int**)&cols, (const double**)&vals);
                 MatRestoreRow(K_transp,row,&ncols2,(const int**)&cols2,(const double**)&vals2);
@@ -88 +88 @@
                         }
                         if(fabs(d)>dmax) dmax = fabs(d);
-                        MatSetValue(LHS,row,cols[j],(const double)d,INSERT_VALUES);
+                        MatSetValue(LHS,row,cols[j],d,INSERT_VALUES);
                 }
                 MatRestoreRow(K,row,&ncols, (const int**)&cols, (const double**)&vals);
@@ -107 +107 @@
                         constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
                         if(dof!=-1){
-                                MatSetValue(LHS,dof,dof,(const double)dmax,INSERT_VALUES);
+                                MatSetValue(LHS,dof,dof,dmax,INSERT_VALUES);
                         }
                 }
@@ -256 +256 @@
                 d = 1.;
                 if(Pi_plus!=0.) d = min(1.,Qi_plus/Pi_plus);
-                VecSetValue(Ri_plus,row,(const double)d,INSERT_VALUES);
+                VecSetValue(Ri_plus,row,d,INSERT_VALUES);
                 d = 1.;
                 if(Pi_minus!=0.) d = min(1.,Qi_minus/Pi_minus);
-                VecSetValue(Ri_minus,row,(const double)d,INSERT_VALUES);
+                VecSetValue(Ri_minus,row,d,INSERT_VALUES);
 
                 MatRestoreRow(Mc,row,&ncols, (const int**)&cols, (const double**)&vals);
@@ -311 +311 @@
                         }
                 }
-                VecSetValue(Fbar,row,(const double)d,INSERT_VALUES);
+                VecSetValue(Fbar,row,d,INSERT_VALUES);
                 MatRestoreRow(Mc,row,&ncols, (const int**)&cols, (const double**)&vals);
                 MatRestoreRow(D ,row,&ncols2,(const int**)&cols2,(const double**)&vals2);