source: issm/oecreview/Archive/24684-25833/ISSM-25343-25344.diff

Last change on this file was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833
File size: 1.4 KB
RevLine 
[25834]1Index: ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py
2===================================================================
3--- ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py (revision 25343)
4+++ ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py (revision 25344)
5@@ -25,7 +25,7 @@
6 '''
7
8 # Get Gmsh version
9- subproc_args = "gmsh -info | command grep 'Version' | sed -e 's/Version[[:blank:]]*:[[:blank:]]//' | cut -d '.' -f1"
10+ subproc_args = "gmsh -info 2>&1 | command grep 'Version' | sed -e 's/Version[[:blank:]]*:[[:blank:]]//' | cut -d '.' -f1"
11 subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
12 outs, errs = subproc.communicate()
13 if errs != '':
14Index: ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m
15===================================================================
16--- ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m (revision 25343)
17+++ ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m (revision 25344)
18@@ -15,7 +15,7 @@
19 % md.mesh=gmshplanet('radius',6000,'resolution',100);
20
21 % Get Gmsh version
22- [s,r]=system(['gmsh -info | command grep ''Version'' | sed -e ''s/Version[[:blank:]]*:[[:blank:]]//'' | cut -d ''.'' -f1']);
23+ [s,r]=system(['gmsh -info 2>&1 | command grep ''Version'' | sed -e ''s/Version[[:blank:]]*:[[:blank:]]//'' | cut -d ''.'' -f1']);
24 if s~=0,
25 error(r);
26 end
Note: See TracBrowser for help on using the repository browser.