Changeset 25095

Timestamp:

06/22/20 10:37:43 (5 years ago)

Author:

jdquinn

Message:

CHG: Moved retrieval of Gmsh major version out of core and back to scripting side.

Location:

issm/trunk-jpl

Files:

• jenkins/ross-debian_linux-binaries-solid_earth (modified) (1 diff)
• jenkins/ross-debian_linux-solid_earth (modified) (1 diff)
• src/m/mesh/planet/gmsh/gmshplanet.m (modified) (1 diff)
• src/m/mesh/planet/gmsh/gmshplanet.py (modified) (2 diffs)
• src/wrappers/IssmConfig/IssmConfig.cpp (modified) (1 diff)

issm/trunk-jpl/jenkins/ross-debian_linux-binaries-solid_earth

@@ -32 +32 @@
         --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
-        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
-        --with-gmsh-dir=${ISSM_DIR}/externalpackages/gmsh/install
+        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install
 '
 

issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

@@ -23 +23 @@
         --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
-        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
-        --with-gmsh-dir=${ISSM_DIR}/externalpackages/gmsh/install \
+        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install
 '
 

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

@@ -16 +16 @@
 
         % Get Gmsh version
-        gmshmajorversion = IssmConfig('_GMSH_VERSION_MAJOR_');
-
+        [s,r]=system(['gmsh -info | grep ''Version'' | sed -e ''s/Version[[:blank:]]*:[[:blank:]]//'' | cut - d ''.'' -f1'])
+        if s~=0,
+                error(r);
+        end
+        gmshmajorversion=r
         if ~ismember([3,4],gmshmajorversion),
                 error(['gmshplanet: Gmsh major version ' gmshmajorversion ' not supported!']);

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

@@ -3 +3 @@
 import numpy as np
 
-from IssmConfig import IssmConfig
 from MatlabFuncs import *
 from mesh3dsurface import *
@@ -27 +26 @@
 
     # Get Gmsh version
-    gmshmajorversion = IssmConfig('_GMSH_VERSION_MAJOR_')[0] # Stored as IssmDouble, which gets instantiated as a tuple in Python
-
+    args = "gmsh -info | grep 'Version' | sed -e 's/Version[[:blank:]]*:[[:blank:]]//' | cut - d '.' -f1"
+    proc = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    outs, errs = proc.communicate()
+    if errs != '':
+        raise Exception("gmshplanet: call to gmsh failed: {}".format(errs))
+    gmshmajorversion = outs
     if gmshmajorversion not in [3, 4]:
         raise RuntimeError('gmshplanet: Gmsh major version %s not supported!' % gmshmajorversion)

issm/trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp

@@ -107 +107 @@
                 #endif
         }
-        else if(strcmp(name,"_GMSH_VERSION_MAJOR_")==0){
-                #ifdef _GMSH_VERSION_MAJOR_
-                value = IssmDouble(_GMSH_VERSION_MAJOR_);
-                #else
-                _error_("_GMSH_VERSION_MAJOR_ not found in config.h");
-                #endif
-        }
         else if(strcmp(name,"ISSM_PREFIX")==0){
                 isstring = true;