Changeset 23737

Timestamp:

02/18/19 14:14:08 (6 years ago)

Author:

kruegern

Message:

BUG: fixed various minor bugs preventing ADOLC and SE from building properly

Location:

issm/trunk-jpl/src/m

Files:

• boundaryconditions/love_numbers.py (modified) (2 diffs)
• classes/autodiff.py (modified) (1 diff)
• classes/materials.py (modified) (1 diff)
• coordsystems/gmtmask.py (modified) (1 diff)

issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py

@@ -17 +17 @@
 # 
 
-        # some checks:
-        if len(varargin)==0:
-                frame='CM';
-                print('Info: computation is done in Center of Mass (CM) reference frame by default')
-        elif len(varargin)==1: 
-                reference_frame = varargin[0]
-                if (reference_frame in ['CF','CM']):
-                        frame=reference_frame;
-                else:
-                        raise RuntimeError('reference_frame should be one of ''CM'' or ''CF''')
+    # some checks:
+    if len(varargin)==0:
+        frame='CM';
+        print('Info: computation is done in Center of Mass (CM) reference frame by default')
+    elif len(varargin)==1: 
+        reference_frame = varargin[0]
+        if (reference_frame in ['CF','CM']):
+            frame=reference_frame;
         else:
-                raise RuntimeError('love_numbers error message: bad usage') 
+            raise RuntimeError('reference_frame should be one of ''CM'' or ''CF''')
+    else:
+        raise RuntimeError('love_numbers error message: bad usage') 
         
-        if value not in ['h','k','l','gamma','lambda']:
-                raise RuntimeError('value should be one of ''h'',''k'',''l'',''gamma'' and ''lambda''') 
+    if value not in ['h','k','l','gamma','lambda']:
+        raise RuntimeError('value should be one of ''h'',''k'',''l'',''gamma'' and ''lambda''') 
         
-        if len(varargin)>1: 
-            raise RuntimeError('love_numbers error message: wrong usage') 
+    if len(varargin)>1: 
+        raise RuntimeError('love_numbers error message: wrong usage') 
         
-        love_numbers=np.array([[    0         , 0          ,0          ,0          ,0          ,0          ,0          ],
+    love_numbers=np.array([[    0         , 0          ,0          ,0          ,0          ,0          ,0          ],
                                                                                                  [      -1.28740059,-1.00000000,-0.89858519,1.28740059, 0.42519882  ,0.89858519 ,0.00000000 ],
                                                                                                  [      -1.00025365, -0.30922675, 0.02060926, 1.69102690, 0.46358648, 0.67016399, 0.61829668],
@@ -10038 +10038 @@
                                                                                                  [      -6.27342778, -0.00030945, 0.00018956, 7.27311833, 0.99905480, 0.99950099, 0.49327194]]);
                                                                                                  
-        if value=='h':
-                series=love_numbers[:,0];
-        elif value=='k':
-                series=love_numbers[:,1];
-        elif value=='l':
-                series=love_numbers[:,2];
-        elif value=='gamma':
-                series=love_numbers[:,3];
-        elif value=='lambda':
-                series=love_numbers[:,4];
-        else:
-                raise RuntimeError(['love_numbers error message: unknow value:', value])
+    if value=='h':
+        series=love_numbers[:,0];
+    elif value=='k':
+        series=love_numbers[:,1];
+    elif value=='l':
+        series=love_numbers[:,2];
+    elif value=='gamma':
+        series=love_numbers[:,3];
+    elif value=='lambda':
+        series=love_numbers[:,4];
+    else:
+        raise RuntimeError(['love_numbers error message: unknow value:', value])
         
         # choose degree 1 term for CF reference system 
-        if frame=='CF': # from Blewitt, 2003, JGR 
-            if value=='h':
-                    series[1] = -0.269; 
-            elif value=='k':
-                    series[1] = 0.021;  
-            elif value=='l':
-                    series[1] = 0.134; 
+    if frame=='CF': # from Blewitt, 2003, JGR 
+        if value=='h':
+            series[1] = -0.269; 
+        elif value=='k':
+            series[1] = 0.021;  
+        elif value=='l':
+            series[1] = 0.134; 
 
-        return series
+    return series
 

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

@@ -5 +5 @@
 from checkfield import checkfield
 from WriteData import WriteData
+from MatlabArray import *
 
 class autodiff(object):

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

@@ -220 +220 @@
                                                         raise RuntimeError("%s%i%s"%('2 or more adjacent fluid layers detected starting at layer ',i,'. This is not supported yet. Consider merging them.'))
 
-                                                else:
-                                                        raise RuntimeError("materials checkconsistency error message: nature of the material not supported yet! ('ice' or 'litho')");
+                        else:
+                                raise RuntimeError("materials checkconsistency error message: nature of the material not supported yet! ('ice' or 'litho')");
 
                 return md

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

@@ -38 +38 @@
         #First, write our lat,long file for gmt:
         nv=lenlat
-        np.savetxt('./all_vertices.txt',np.transpose([int, lat, np.arange(1,nv+1)]),delimiter='\t',fmt='%.10f')
+        #print(np.transpose([int, lat, np.arange(1,nv+1)]))
+        np.savetxt('./all_vertices.txt',np.transpose([long, lat, np.arange(1,nv+1)]),delimiter='\t',fmt='%.10f')
 
         #Avoid bypassing of the ld library path by Matlab (:()