Changeset 22771

Timestamp:

05/15/18 08:27:05 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing call to gmsh for workshop binaries

Location:

issm/trunk

Files:

• packagers/macosx/package.sh (modified) (1 diff)
• src/m/mesh/planet/gmsh/gmshplanet.m (modified) (2 diffs)

issm/trunk/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
+echo "move gmt to bin" 
+if [ -f ../externalpackages/gmt/install/gmt ]; then
+        cp ../externalpackages/gmt/install/gmt .
+else
+        echo "gmt not found"
 fi
 

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

@@ -102 +102 @@
         end
 
+        %Find path to gmsh
+        paths = {[issmdir() '/bin/gmsh'],[issmdir() '/externalpackages/gmsh/install/gmsh']};
+        gmshpath = '';
+        for i=paths
+                if exist(i{1},'file'),
+                        gmshpath = i{1}
+                end
+        end
+        if isempty(gmshpath),
+                error('gmt not found, make sure it is properly installed');
+        end
+
         %call gmsh
         if  exist(options,'refine'),
-                eval(['!gmsh -tol 1e-8 -2 sphere.geo -bgm sphere.pos']);
+                system([gmshpath ' -tol 1e-8 -2 sphere.geo -bgm sphere.pos']);
         else
-                %call gmsh
-                eval(['!gmsh -tol 1e-8 -2 sphere.geo']);
+                system([gmshpath ' -tol 1e-8 -2 sphere.geo']);
         end
 
@@ -163 +174 @@
 
         %erase files: 
-        eval(['!rm -rf sphere.geo sphere.msh sphere.pos']);
+        system('rm -rf sphere.geo sphere.msh sphere.pos');
 
         %return mesh: