Changeset 25138

Timestamp:

06/24/20 17:33:44 (5 years ago)

Author:

Eric.Larour

Message:

CHG: merging loadlove and tidallove classes. Revamped load_numbers.m to
use options. Default constructors for love class also, to avoid having to set
them up each time.

Location:

issm/trunk-jpl/src/m

Files:

• boundaryconditions/love_numbers.m (modified) (5 diffs)
• classes/love.m (added)
• classes/solidearth.m (modified) (1 diff)
• classes/tidallove.m (deleted)

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

@@ -1 @@
-function series=love_numbers(type,reference_frame)
+function series=love_numbers(varargin)
 %LOVE_NUMBERS: provide love numbers 
 %       retrieved from: http://www.srosat.com/iag-jsg/loveNb.php 
@@ -5 +5 @@
 %  
 %       Usage: 
-%       series = love_numbers(type) 
-%       series = love_numbers(type,reference_frame) 
+%       series = love_numbers('type','loadingverticaldisplacement','referenceframe','CM','maxdeg',1001) 
 % 
-%       - type = one of 'h','k','l','gamma' and 'lambda'. 
+%       - type = one of 'loadingverticaldisplacement', 'loadinggravitationalpotential', 'loadinghorizontaldisplacement',  ...
+%                    'tidalverticaldisplacement', 'tidalgravitationalpotential', 'tidalhorizontaldisplacement'
 %       - reference_frame = one of 'CM' (default) and 'CF'.
+%   - maxdeg = default 1001
 %
 %       Example:  
-%       love_k = love_numbers('k');
-%       love_k = love_numbers('k','CF');
-% 
+%       h=love_number('type','loadingverticaldisplacement','referenceframe','CM','maxdeg',maxdeg);
+%       k=love_number('type','loadinggravitationalpotential','referenceframe','CM','maxdeg',maxdeg);
+%       l=love_number('type','loadinghorizontaldisplacement','referenceframe','CM','maxdeg',maxdeg);
+%       th=love_number('type','tidalverticaldisplacement','referenceframe','CM','maxdeg',maxdeg);
+%       tk=love_number('type','tidalgravitationalpotential','referenceframe','CM','maxdeg',maxdeg);
+%       tl=love_number('type','tidalhorizontaldisplacement','referenceframe','CM','maxdeg',maxdeg);
 
-% some checks:
-if nargin==1, 
-        frame='CM'; 
-        disp('Info: computation is done in Center of Mass (CM) reference frame'); 
-elseif nargin==2,
-        frame=reference_frame;
-        if ~( strcmpi(reference_frame,'CM') | strcmpi(reference_frame,'CF')), 
-                error('reference_frame should be one of ''CM'' or ''CF''');
-        end
-else
-        help love_numbers
-        error('bad usage'); 
+%recover options: 
+options=pairoptions(varargin{:});
+type=getfieldvalue(options,'type');
+frame=getfieldvalue(options,'referenceframe','CM');
+maxdeg=getfieldvalue(options,'maxdeg',1000);
+
+if(maxdeg>10000),
+        error('PREM love numbers computed only for deg < 10,000. Request lower maxdeg' );
 end
 
-if ~( strcmpi(type,'h') | strcmpi(type,'k') | strcmpi(type,'l') | strcmpi(type,'gamma') | strcmpi(type,'lambda') ), 
-        error('type should be one of ''h'',''k'',''l'',''gamma'' and ''lambda''');
+if ~( strcmpi(type,'loadingverticaldisplacement') | strcmpi(type,'loadinggravitationalpotential') | strcmpi(type,'loadinghorizontaldisplacement') ...
+                | strcmpi(type,'tidalverticaldisplacement') | strcmpi(type,'tidalgravitationalpotential') | strcmpi(type,'tidalhorizontaldisplacement')), 
+        error('type should be one of ''loadingverticaldisplacement'', ''loadinggravitationalpotential'', ''loadinghorizontaldisplacement'',''tidalverticaldisplacement'', ''tidalgravitationalpotential'', ''tidalhorizontaldisplacement''');
 end
 
-                love_numbers=[...
+        love_numbers=[...
      0           0          0          0          0          0          0 
         -1.28740059     -1.00000000     -0.89858519 1.28740059 0.42519882 0.89858519 0.00000000
@@ -10037 +10038 @@
         -6.27342778 -0.00030945 0.00018956 7.27311833 0.99905480 0.99950099 0.49327194];
 
-        if type=='h',
+        %cut off series at maxdeg: 
+        love_numbers(maxdeg+2:end,:)=[];
+
+        %retrive right type: 
+        if strcmpi(type,'loadingverticaldisplacement'),
                 series=love_numbers(:,1);
-        elseif type=='k',
+        elseif strcmpi(type,'loadinggravitationalpotential'),
                 series=love_numbers(:,2);
-        elseif type=='l',
+        elseif strcmpi(type,'loadinghorizontaldisplacement'),
                 series=love_numbers(:,3);
-        elseif type=='gamma',
+        elseif strcmpi(type,'tidalverticaldisplacement'),
                 series=love_numbers(:,4);
-        elseif type=='lambda',
+        elseif strcmpi(type,'tidalgravitationalpotential'),
                 series=love_numbers(:,5);
+        elseif strcmpi(type,'tidalhorizontaldisplacement'),
+                series=love_numbers(:,6);
         else 
                 error(['love_numbers error message: unknow type:' type]);
@@ -10052 +10059 @@
 
         % choose degree 1 term for CF reference system 
-        if frame=='CM', 
+        if strcmpi(frame,'CM'), 
                 return; 
-        elseif frame=='CF', % from Blewitt, 2003, JGR 
-                if type=='h',
+        elseif strcmpi(frame,'CF'), % from Blewitt, 2003, JGR 
+                if strcmpi(type,'loadingverticaldisplacement'),
                         series(2,1) = -0.269; 
-                elseif type=='k',
+                elseif strcmpi(type,'loadinggravitationalpotential'),
                         series(2,1) = 0.021;  
-                elseif type=='l',
+                elseif strcmpi(type,'loadinghorizontaldisplacement'),
                         series(2,1) = 0.134; 
                 end
@@ -10066 +10073 @@
         end
 
+
+

issm/trunk-jpl/src/m/classes/solidearth.m

@@ -9 +9 @@
                 settings               = solidearthsettings(); 
                 surfaceload            = surfaceload();
-                love                   = loadinglove();
+                love                   = love();
                 rotational             = rotational();
                 planetradius           = planetradius('earth');