Changeset 3131

Timestamp:

02/25/10 00:12:30 (15 years ago)

Author:

Eric.Larour

Message:

New options for nehalem and harpertown cpus.
Penta: fixed huge bug! slope[2] is too small in a Penta! it should be slope[3]!
spcin and loadresultsfromcluster need login.

Location:

issm/trunk

Files:

• configs/pleiades/pleiades.sh (modified) (1 diff)
• etc/cluster.rc (modified) (1 diff)
• externalpackages/matlab/install.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/objects/Penta.cpp (modified) (8 diffs)
• src/m/classes/public/loadresultsfromcluster.m (modified) (1 diff)
• src/m/utils/OS/scpin.m (modified) (2 diffs)

issm/trunk/configs/pleiades/pleiades.sh

@@ -1 +1 @@
 #!/bin/csh
 
-./configure --prefix=$ISSM_DIR --with-serial=no --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=/nasa/sgi/mpt/1.23.nas/includ  --with-mpi-lib="-L/nasa/sgi/mpt/1.23.nas/lib64/ -lmpi -lpthread -lgfortran" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ --with-plapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11/lib64/libX11.so --with-cxxoptflags="-O3 -xSSE4.2" --with-vendor=intel-pleiades
+./configure --prefix=$ISSM_DIR --with-serial=no --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=/nasa/sgi/mpt/1.23.nas/includ  --with-mpi-lib="-L/nasa/sgi/mpt/1.23.nas/lib64/ -lmpi -lpthread -lgfortran" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ --with-plapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11/lib64/libX11.so --with-cxxoptflags="-O3 -xS" --with-vendor=intel-pleiades

issm/trunk/etc/cluster.rc

@@ -74 +74 @@
 cluster_name=pfe
 cluster_codepath=/home1/elarour/trunk/bin
-cluster_executionpath=/home1/elarour/Testing
+cluster_executionpath=/nobackup/elarour/Testing
 cluster_login=elarour
 

issm/trunk/externalpackages/matlab/install.sh

@@ -6 +6 @@
 #symlink matlab to root matlab
 ln -s /usr/local/pkgs/matlab-7.6/ install
-

issm/trunk/m4/issm_options.m4

@@ -641 +641 @@
                         export CC=icc
                         export CXX=icpc
-                        export CXXFLAGS=" -O3 -D_INTEL_LINUX_ -xSSE4.2"
+                        export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
                 else
                 AC_MSG_ERROR([unknow compiler vendor!])

issm/trunk/src/c/objects/Penta.cpp

@@ -634 +634 @@
         } 
 
-cleanup_and_return: 
         xfree((void**)&first_gauss_area_coord);
         xfree((void**)&second_gauss_area_coord);
@@ -921 +920 @@
         MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)K_terms,ADD_VALUES);
 
-cleanup_and_return: 
 
         /*Free ressources:*/
@@ -1066 +1064 @@
         MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_gg,ADD_VALUES);
 
-cleanup_and_return: 
         xfree((void**)&first_gauss_area_coord);
         xfree((void**)&second_gauss_area_coord);
@@ -1382 +1379 @@
         MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)K_terms,ADD_VALUES);
 
-cleanup_and_return: 
         xfree((void**)&first_gauss_area_coord);
         xfree((void**)&second_gauss_area_coord);
@@ -1515 +1511 @@
 
         /* parameters: */
-        double  slope[NDOF2];
+        double  slope[3]; //do not put 2! this goes into GetParameterDerivativeValue, which addresses slope[3] also!
         double  driving_stress_baseline;
         double  thickness;
@@ -1647 +1643 @@
         VecSetValues(pg,numdof,doflist,(const double*)pe_g,ADD_VALUES);
 
-cleanup_and_return: 
         xfree((void**)&first_gauss_area_coord);
         xfree((void**)&second_gauss_area_coord);
@@ -2035 +2030 @@
         VecSetValues(pg,numdof,doflist,(const double*)pe_g,ADD_VALUES);
 
-cleanup_and_return: 
         xfree((void**)&first_gauss_area_coord);
         xfree((void**)&second_gauss_area_coord);
@@ -2281 +2275 @@
         extern int my_rank;
 
-cleanup_and_return:
         xfree((void**)&first_gauss_area_coord);
         xfree((void**)&second_gauss_area_coord);

issm/trunk/src/m/classes/public/loadresultsfromcluster.m

@@ -26 +26 @@
 
 %copy files from cluster to present directory
-scpin(md.cluster, executionpath, packages);
+scpin(md.cluster, login, executionpath, packages);
 
 %read log files onto  fields
-md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n'));
-md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n'));
+%md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n'));
+%md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n'));
 if ~isempty(md.errlog),
         disp(['loadresultsfromcluster info message: error during solution. Check your errlog and outlog model fields']);

issm/trunk/src/m/utils/OS/scpin.m

@@ -1 @@
-function scpin(host, path, packages)
+function scpin(host, login,path, packages)
 %SCPIN get packages from host, using scp on unix, and pscp on windows
 %
@@ -58 +58 @@
                 string=[string packages{end} '\}'];
 
-                eval(['!scp ' host ':' path '/' string ' ./']);
+                eval(['!scp ' login '@' host ':' path '/' string ' ./']);
                 for i=1:numel(packages),
                         if ~exist(['./' packages{i}]),