source: issm/oecreview/Archive/24684-25833/ISSM-25094-25095.diff@ 27230

Index: ../trunk-jpl/jenkins/ross-debian_linux-binaries-solid_earth
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-binaries-solid_earth (revision 25094)
+++ ../trunk-jpl/jenkins/ross-debian_linux-binaries-solid_earth (revision 25095)
@@ -31,8 +31,7 @@
        --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
        --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
 '
 
 #-------------------#
Index: ../trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp
===================================================================
--- ../trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp (revision 25094)
+++ ../trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp (revision 25095)
@@ -106,13 +106,6 @@
                _error_("_DAKOTA_VERSION_ not found in config.h");
                #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;
                svalue =xNew<char>(strlen(ISSM_PREFIX)+1);
Index: ../trunk-jpl/jenkins/ross-debian_linux-solid_earth
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-solid_earth  (revision 25094)
+++ ../trunk-jpl/jenkins/ross-debian_linux-solid_earth  (revision 25095)
@@ -22,8 +22,7 @@
        --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
        --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
 '
 
 #-------------------#
Index: ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py
===================================================================
--- ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py   (revision 25094)
+++ ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py   (revision 25095)
@@ -2,7 +2,6 @@
 
 import numpy as np
 
-from IssmConfig import IssmConfig
 from MatlabFuncs import *
 from mesh3dsurface import *
 from pairoptions import *
@@ -26,8 +25,12 @@
     '''
 
     # 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)
 
Index: ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m
===================================================================
--- ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m    (revision 25094)
+++ ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m    (revision 25095)
@@ -15,8 +15,11 @@
 %      md.mesh=gmshplanet('radius',6000,'resolution',100);
 
        % 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!']);
        end