Changeset 22356

Timestamp:

01/15/18 14:05:23 (7 years ago)

Author:

adhikari

Message:

CHG: minor

File:

• issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py (modified) (2 diffs)

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

@@ -17 +17 @@
 # 
 
-        # some checks:
-        if varargin==1:
-            frame='CM'; 
-        elif varargin==2: 
-            frame=reference_frame;
-        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 len(varargin)>1: 
+            raise RuntimeError('love_numbers error message: wrong usage') 
         
         love_numbers=np.array([[    0         , 0          ,0          ,0          ,0          ,0          ,0          ],
@@ -10044 +10039 @@
         
         # choose degree 1 term for CF reference system 
-        if frame=='CF': # from Blewitt, 2003, JGR 
-            if value=='h':
+        for frame in varargin:
+            if frame=='CF': # from Blewitt, 2003, JGR 
+                if value=='h':
                     series[2,1] = -0.269; 
-            elif value=='k':
+                elif value=='k':
                     series[2,1] = 0.021;  
-            elif value=='l':
+                elif value=='l':
                     series[2,1] = 0.134; 
-        
+
         return series