Changeset 27632

Timestamp:

03/06/23 19:46:15 (2 years ago)

Author:

jdquinn

Message:

CHG: Corrections to allow for finding of gmsh at all typical locations

Location:

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

Files:

• gmshplanet.m (modified) (4 diffs)
• gmshplanet.py (modified) (4 diffs)

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

@@ -1 +1 @@
 function mesh=gmshplanet(varargin)
-%GMSHPLANET - mesh generation for a sphere. Very specific code for gmsh from $ISSM_DIR/src/demos/simple_geo/sphere.geo
+%GMSHPLANET - mesh generation for a sphere. Very specific code for Gmsh from $ISSM_DIR/src/demos/simple_geo/sphere.geo
 %
 %   Available options (for more details see ISSM website http://issm.jpl.nasa.gov/):
@@ -16 +16 @@
 
         %Find path to gmsh
-        paths = {
-                [getenv('ISSM_EXT_DIR') '/shared/gmsh/install/bin/gmsh'],...
-                [getenv('ISSM_EXT_DIR') '/static/gmsh/install/bin/gmsh'],...
-                [getenv('ISSM_EXT_DIR') '/gmsh/install/bin/gmsh'],...
-                [issmdir() 'externalpackages/gmsh/install/bin/gmsh'],...
-                [issmdir() 'bin/gmsh'],...
-                ['/usr/bin/gmsh']...
+        paths={
+                [getenv('ISSM_EXT_DIR') '/shared/gmsh/install/bin'],...
+                [getenv('ISSM_EXT_DIR') '/static/gmsh/install/bin'],...
+                [getenv('ISSM_EXT_DIR') '/gmsh/install/bin'],...
+                [issmdir() '/externalpackages/gmsh/install/bin'],...
+                [issmdir() '/bin'],...
+                ['/usr/bin']...
         };
-        gmshpath = '';
+        gmshpath='';
         for i=paths
-                if exist(i{1},'file'),
+                if exist([i{1} '/gmsh'],'file'),
                         gmshpath = i{1};
                         break;
@@ -32 +32 @@
         end
         if isempty(gmshpath),
-                error('Gmsh not found, make sure it is properly installed');
-        end
+                error('gmshplanet: gmsh executable not found!');
+        end
+
+        setenv('PATH', [gmshpath ':' getenv('PATH')]);
 
         % Get Gmsh version
@@ -39 +41 @@
         if s~=0 || contains(r, 'dyld'),
                 error(['gmshplanet: ' r]);
-        elseif isempty(r),
-                % If this function is called from one of our distributable packages, we 
-                % need to do a bit more to find the Gmsh executable
-                [filepath,name,ext]=fileparts(which('gmsh.'));
-                setenv('PATH',[filepath ':' getenv('PATH')]);
-                [s,r]=system(['gmsh -info | command grep ''Version'' | sed -e ''s/Version[[:blank:]]*:[[:blank:]]//'' | cut -d ''.'' -f1']);
-                if s~=0 || contains(r, 'dyld'),
-                        error(['gmshplanet: ' r]);
-                elseif isempty(r),
-                        error('gmshplanet: Gmsh executable not found!');
-                end
         end
         gmshmajorversion=str2num(r);

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

@@ +1 @@
+import os
 import subprocess
 import numpy as np
+from issmdir import issmdir
 from MatlabFuncs import *
 from mesh3dsurface import *
@@ -7 +9 @@
 
 def gmshplanet(*args):
-    """GMSHPLANET - mesh generation for a sphere. Very specific code for gmsh from $ISSM_DIR/src/demos/simple_geo/sphere.geo
+    """gmshplanet - mesh generation for a sphere. Very specific code for Gmsh from $ISSM_DIR/src/demos/simple_geo/sphere.geo
 
     Available options (for more details see ISSM website http://issm.jpl.nasa.gov/):
@@ -21 +23 @@
         md.mesh = gmshplanet('radius', 6000, 'resolution', 100);
     """
+
+    # Find path to gmsh
+    paths = [
+        os.environ.get('ISSM_EXT_DIR') + '/shared/gmsh/install/bin',
+        os.environ.get('ISSM_EXT_DIR') + '/static/gmsh/install/bin',
+        os.environ.get('ISSM_EXT_DIR') + '/gmsh/install/bin',
+        issmdir() + '/externalpackages/gmsh/install/bin',
+        issmdir() + '/bin',
+        '/usr/bin'
+    ]
+    gmshpath = ''
+    for path in paths:
+        if exists(path + '/gmsh'):
+            gmshpath = path
+            break
+    if gmshpath == '':
+        error('gmshplanet: gmsh executable not found!')
+
+    os.environ['PATH'] = gmshpath ':' os.environ.get['PATH']
 
     # Get Gmsh version
@@ -195 +216 @@
 
     # A little technicality here. The mesh is not exactly on the sphere. We
-    # create lat,long coordiantes, and reproject onto an exact sphere.
+    # create lat,long coordinates, and reproject onto an exact sphere.
     mesh.r = np.sqrt(mesh.x ** 2 + mesh.y ** 2 + mesh.z ** 2)