Changeset 22359

Timestamp:

01/16/18 15:11:01 (7 years ago)

Author:

kruegern

Message:

CHG: changed love_numbers.py to more closely resemble the .m version

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 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''')
+        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''') 
+                raise RuntimeError('value should be one of ''h'',''k'',''l'',''gamma'' and ''lambda''') 
         
         if len(varargin)>1: 
@@ -10039 +10052 @@
         
         # choose degree 1 term for CF reference system 
-        for frame in varargin:
-            if frame=='CF': # from Blewitt, 2003, JGR 
-                if value=='h':
+        if frame=='CF': # from Blewitt, 2003, JGR 
+            if value=='h':
                     series[1] = -0.269; 
-                elif value=='k':
+            elif value=='k':
                     series[1] = 0.021;  
-                elif value=='l':
+            elif value=='l':
                     series[1] = 0.134;