Changeset 22821

Timestamp:

05/31/18 10:42:48 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• externalpackages/gdal/install-1.10-linux64-nopython.sh (copied) (copied from issm/trunk/externalpackages/gdal/install-1.10-linux64-nopython.sh )
• externalpackages/gdal/install-1.6-linux64-murdo.sh (deleted)
• externalpackages/gdal/install-1.6-macosx64.sh (deleted)
• externalpackages/gmsh/install-static.sh (copied) (copied from issm/trunk/externalpackages/gmsh/install-static.sh )
• externalpackages/gmt/configs/ConfigUser.cmake-static (copied) (copied from issm/trunk/externalpackages/gmt/configs/ConfigUser.cmake-static )
• externalpackages/gmt/install-static.sh (copied) (copied from issm/trunk/externalpackages/gmt/install-static.sh )
• externalpackages/mpich/install-3.2-macosx64-static.sh (modified) (1 diff)
• jenkins/linux64_ross_static (modified) (2 diffs)
• jenkins/macosx_pine-island_static (modified) (1 diff)
• packagers/macosx/package.sh (modified) (3 diffs)
• packagers/ubuntu/package.sh (modified) (2 diffs)
• src (modified) (1 prop)
• src/m/coordsystems/gmtmask.m (modified) (1 diff)
• src/m/coordsystems/gmtmaskparallel.m (modified) (1 diff)
• src/m/mesh/planet/gmsh/gmshplanet.m (modified) (1 diff)
• test (modified) (1 prop)
• test/ggg2 (deleted)

issm/trunk-jpl/externalpackages/mpich/install-3.2-macosx64-static.sh

@@ -23 +23 @@
 cd src
 ./configure \
-        --prefix="$ISSM_DIR/externalpackages/mpich/install"
+        --prefix="$ISSM_DIR/externalpackages/mpich/install" \
+        --disable-shared 
 
 #Compile mpich (this new version supports parallel make)

issm/trunk-jpl/jenkins/linux64_ross_static

@@ -23 +23 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
+        --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
         --with-numthreads=4'
@@ -41 +42 @@
                                                 petsc        install-3.7-linux64-static.sh
                                                 triangle     install-linux64.sh
+                                                math77        install.sh
+                                                gmsh          install-static.sh
                                                 shell2junit  install.sh"
 

issm/trunk-jpl/jenkins/macosx_pine-island_static

@@ -42 +42 @@
                                                 triangle     install-macosx64.sh
                                                 math77        install.sh
-                                                gmsh          install.sh
+                                                gmsh          install-static.sh
                                                 shell2junit  install.sh"
 
+#for SLR we need gmsh to mesh, math77, and gmt (which itself needs gdal and netcdf...)
 #-----------------#
 # 4: test options #

issm/trunk-jpl/packagers/macosx/package.sh

@@ -7 +7 @@
 cp ../externalpackages/mpich/install/bin/mpiexec .
 cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
+echo "move gmsh to bin" 
+if [ -f ../externalpackages/gmsh/install/gmsh ]; then
+        cp ../externalpackages/gmsh/install/gmsh .
+else
+        echo "gmsh not found"
+fi
 
 #Check that test101 runs
@@ -20 +26 @@
 fi
 
-#Package using the Package Maker from OSX, driven by command line.
 tarball_name='issm-mac-static_build.tar.gz'
 
@@ -31 +36 @@
 rm -rf trunk
 mkdir trunk
-#Need script to download data
 cp -rf bin lib test examples scripts trunk/
 tar -czf $tarball_name trunk

issm/trunk-jpl/packagers/ubuntu/package.sh

@@ -7 +7 @@
 cp ../externalpackages/mpich/install/bin/mpiexec .
 cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
+echo "move gmsh to bin" 
+if [ -f ../externalpackages/gmsh/install/gmsh ]; then
+        cp ../externalpackages/gmsh/install/gmsh .
+else
+        echo "gmsh not found"
+fi
 
 #Check that test101 runs
@@ -30 +36 @@
 rm -rf trunk
 mkdir trunk
-cp -rf bin lib test examples trunk/
+cp -rf bin lib test examples scripts trunk/
 tar -czf $tarball_name trunk
 ls -lah $tarball_name

issm/trunk-jpl/src/m/coordsystems/gmtmask.m

@@ -41 +41 @@
         end
 
+        %Find path to gmt, list all possible known paths to gmt (you may need to add yours to the list)
+   paths = {[issmdir() '/bin/gmt'],[issmdir() '/externalpackages/gmt/install/bin/gmt'],'/Applications/GMT-5.4.3.app/Contents/Resources/bin/gmt'};
+   gmtpath = '';
+   for i=paths
+      if exist(i{1},'file'),
+         gmtpath = i{1};
+                        break;
+      end
+   end
+   if isempty(gmtpath),
+      error('gmt not found, make sure it is properly installed, or add its path to this file (line 44)');
+   end
+   
         %figure out which vertices are on the ocean, which one on the continent:
-        [status,result] = system(['gmt gmtselect ./' filename_all ' -h0 -Df -R0/360/-90/90  -A0 -JQ180/200 -Nk/s/s/k/s > ./' filename_oce]);
+        [status,result] = system([gmtpath ' gmtselect ./' filename_all ' -h0 -Df -R0/360/-90/90  -A0 -JQ180/200 -Nk/s/s/k/s > ./' filename_oce]);
         if status~=0,
                 error(result);

issm/trunk-jpl/src/m/coordsystems/gmtmaskparallel.m

@@ -23 +23 @@
         end
 
+        %Find path to gmt, list all possible known paths to gmt (you may need to add yours to the list)
+   paths = {[issmdir() '/bin/gmt'],[issmdir() '/externalpackages/gmt/install/bin/gmt'],'/Applications/GMT-5.4.3.app/Contents/Resources/bin/gmt'};
+   gmtpath = '';
+   for i=paths
+      if exist(i{1},'file'),
+         gmtpath = i{1};
+                        break;
+      end
+   end
+   if isempty(gmtpath),
+                error('gmt not found, make sure it is properly installed, or add its path to this file (line 26)');
+   end
+
         %Build xjobs script:
         fid=fopen('xjobs.script','w');
         for i=1:length(nnv)-1,
-                fprintf(fid,'gmt gmtselect ./all_vertices%i.txt -h0 -Df -R0/360/-90/90  -A0 -JQ180/200 -Nk/s/s/k/s > ./oce_vertices%i.txt\n',i,i);
+                fprintf(fid,'%s gmtselect ./all_vertices%i.txt -h0 -Df -R0/360/-90/90  -A0 -JQ180/200 -Nk/s/s/k/s > ./oce_vertices%i.txt\n',gmtpath,i,i);
         end
         fclose(fid);

issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m

@@ -107 +107 @@
         for i=paths
                 if exist(i{1},'file'),
-                        gmshpath = i{1}; 
+                        gmshpath = i{1};
+                        break;
                 end
         end