Changeset 25747

Timestamp:

11/12/20 17:00:08 (4 years ago)

Author:

jdquinn

Message:

BUG: Need to find path to gmsh before calling in situations where it is not already in PATH (e.g. binaries).

File:

• issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m (modified) (2 diffs)

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

@@ -15 +15 @@
 %      md.mesh=gmshplanet('radius',6000,'resolution',100);
 
+        %Find path to gmsh
+        paths = {...
+                [issmdir() 'bin/gmsh'],...
+                [issmdir() 'externalpackages/gmsh/install/gmsh']...
+        };
+        disp(paths{1})
+        gmshpath = '';
+        for i=paths
+                if exist(i{1},'file'),
+                        gmshpath = i{1};
+                        break;
+                end
+        end
+        if isempty(gmshpath),
+                error('gmsh not found, make sure it is properly installed');
+        end
+
         % Get Gmsh version
-        [s,r]=system(['gmsh -info 2>&1 | command grep ''Version'' | sed -e ''s/Version[[:blank:]]*:[[:blank:]]//'' | cut -d ''.'' -f1']);
+        [s,r]=system([gmshpath ' -info 2>&1 | command grep ''Version'' | sed -e ''s/Version[[:blank:]]*:[[:blank:]]//'' | cut -d ''.'' -f1']);
         if s~=0,
                 error(r);
@@ -119 +136 @@
         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};
-                        break;
-                end
-        end
-        if isempty(gmshpath),
-                error('gmsh not found, make sure it is properly installed');
-        end
-
         % Call gmsh
         %