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

Timestamp:

06/01/20 10:01:04 (5 years ago)

Author:

jdquinn

Message:

CHG: Moved Gmsh version setting to issm_options.m4 and IssmConfig.cpp because we do not rely on value of ISSM_DIR when testing binaries

File:

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

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

@@ -16 +16 @@
 
         % Get Gmsh version
-        %
-        % NOTE:
-        % - The output of `gmsh -version` does not follow a consistent format 
-        %       across major versions.
-        % - Under Gmsh 3.*, output of `gmsh -info` needs to be explicitly 
-        %       redirected to console in order to be grep'ped.
-        % - May need to modify the regex supplied to `sed` for future Gmsh versions.
-        %
-        % TODO:
-        % - Move this so we can retrieve like we do with 
-        %       `IssmConfig(_DAKOTA_VERSION_)`.
-        %
-        [status,gmshmajorversion]=system('gmsh -info 2>&1 | grep "Version" | sed -e "s/Version[[:blank:]]*:[[:blank:]]//" | cut -d "." -f1');
-
-        gmshmajorversion=str2int(gmshmajorversion);
+    gmshmajorversion = IssmConfig('_GMSH_VERSION_MAJOR_');
 
         if ~ismember([3,4],gmshmajorversion),