Changeset 27530

Timestamp:

01/19/23 05:47:30 (2 years ago)

Author:

bdef

Message:

CHG:moving from gdal to projinfo,

Location:

issm/trunk-jpl/src/m

Files:

• classes/sealevelmodel.py (modified) (1 diff)
• coordsystems/epsg2proj.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/sealevelmodel.py

@@ -241 +241 @@
             self.eltransitions.append(meshintersect3d(xe, ye, ze, xei, yei, zei, 'force', force))
 
-            self.earth.solidearth.transfercount[self.transitions[i]] = self.earth.solidearth/transfercount[self.transitions[i]] + 1
+            self.earth.solidearth.transfercount[self.transitions[i]] = self.earth.solidearth.transfercount[self.transitions[i]] + 1
 
         for i in range(len(self.icecaps)):

issm/trunk-jpl/src/m/coordsystems/epsg2proj.py

@@ -20 +20 @@
 
     #First, get GDAL version
-    subproc_args = "gdalsrsinfo --version | awk '{print $2}' | cut -d '.' -f1"
-    subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
-    outs, errs = subproc.communicate()
-    outs = outs.decode()
-    errs = errs.decode()
-    print(errs != '', errs == '', errs)
-    if errs != '':
-        raise RuntimeError("epsg2proj: call to gdalsrsinfo failed: {}".format(errs))
-
-    version_major = int(outs)
-
-    subproc_args = "gdalsrsinfo epsg:{} | command grep PROJ.4 | tr -d '\n' | sed 's/PROJ.4 : //'".format(epsg)
+    #subproc_args = "gdalsrsinfo --version | awk '{print $2}' | cut -d '.' -f1"
+    subproc_args = "projinfo -o PROJ -q epsg:{}".format(epsg)
     subproc = subprocess.Popen(subproc_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
     outs, errs = subproc.communicate()
     if errs != '':
-        raise RuntimeError("epsg2proj: call to gdalsrsinfo failed: {}".format(errs))
-
-    if version_major == 1:
-        outs = outs[1:-1]
+        raise RuntimeError("epsg2proj: call to projinfo failed: {}".format(errs))
 
     return outs