Changeset 25144

Timestamp:

06/24/20 19:13:48 (5 years ago)

Author:

Eric.Larour

Message:

CHG: resolved serious conflict in naming, all in the name of love

Location:

issm/trunk-jpl/src/m/classes

Files:

• lovenumbers.m (moved) (moved from issm/trunk-jpl/src/m/classes/love.m ) (6 diffs)
• solidearth.m (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/lovenumbers.m ¶

@@ -1 @@
-%LOVE numbers class definition
+%LOVENUMBERS numbers class definition
 %
 %   Usage:
-%      love=love() %will setup love numbers deg 1001 by default
-%      love=love('maxdeg',10001);  %supply numbers of degrees required (here, 10001)
+%      lovenumbers=lovenumbers() %will setup love numbers deg 1001 by default
+%      lovenumbers=lovenumbers('maxdeg',10001);  %supply numbers of degrees required (here, 10001)
 
-classdef love
+classdef lovenumbers
         properties (SetAccess=public) 
                 
@@ -21 +21 @@
         end
         methods
-                function self = love(varargin) % {{{
+                function self = lovenumbers(varargin) % {{{
                         options=pairoptions(varargin{:});
                         maxdeg=getfieldvalue(options,'maxdeg',1000);
@@ -29 +29 @@
                 
                         %initialize love numbers:
-                        self.h=love_numbers('type','loadingverticaldisplacement','referenceframe','CM','maxdeg',maxdeg);
-                        self.k=love_numbers('type','loadinggravitationalpotential','referenceframe','CM','maxdeg',maxdeg);
-                        self.l=love_numbers('type','loadinghorizontaldisplacement','referenceframe','CM','maxdeg',maxdeg);
-                        self.th=love_numbers('type','tidalverticaldisplacement','referenceframe','CM','maxdeg',maxdeg);
-                        self.tk=love_numbers('type','tidalgravitationalpotential','referenceframe','CM','maxdeg',maxdeg);
-                        self.tl=love_numbers('type','tidalhorizontaldisplacement','referenceframe','CM','maxdeg',maxdeg);
+                        self.h=getlovenumbers('type','loadingverticaldisplacement','referenceframe','CM','maxdeg',maxdeg);
+                        self.k=getlovenumbers('type','loadinggravitationalpotential','referenceframe','CM','maxdeg',maxdeg);
+                        self.l=getlovenumbers('type','loadinghorizontaldisplacement','referenceframe','CM','maxdeg',maxdeg);
+                        self.th=getlovenumbers('type','tidalverticaldisplacement','referenceframe','CM','maxdeg',maxdeg);
+                        self.tk=getlovenumbers('type','tidalgravitationalpotential','referenceframe','CM','maxdeg',maxdeg);
+                        self.tl=getlovenumbers('type','tidalhorizontaldisplacement','referenceframe','CM','maxdeg',maxdeg);
 
                         %secular fluid love number: 
@@ -47 +47 @@
                         end
 
-                        md = checkfield(md,'fieldname','solidearth.love.h','NaN',1,'Inf',1);
-                        md = checkfield(md,'fieldname','solidearth.love.k','NaN',1,'Inf',1);
-                        md = checkfield(md,'fieldname','solidearth.love.l','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','solidearth.lovenumbers.h','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','solidearth.lovenumbers.k','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','solidearth.lovenumbers.l','NaN',1,'Inf',1);
                         
                         
-                        md = checkfield(md,'fieldname','solidearth.love.th','NaN',1,'Inf',1);
-                        md = checkfield(md,'fieldname','solidearth.love.tk','NaN',1,'Inf',1);
-                        md = checkfield(md,'fieldname','solidearth.love.tk2secular','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','solidearth.lovenumbers.th','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','solidearth.lovenumbers.tk','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','solidearth.lovenumbers.tk2secular','NaN',1,'Inf',1);
 
                         %check that love numbers are provided at the same level of accuracy: 
                         if (size(self.h,1)~=size(self.k,1) | size(self.h,1)~=size(self.l,1)),
-                                error('love error message: love numbers should be provided at the same level of accuracy');
+                                error('lovenumbers error message: love numbers should be provided at the same level of accuracy');
                         end
 
@@ -67 +67 @@
                 end % }}}
                 function disp(self) % {{{
-                        disp(sprintf('   love parameters:'));
+                        disp(sprintf('   lovenumbers parameters:'));
 
                         fielddisplay(self,'h','load Love number for radial displacement');
@@ -80 +80 @@
                 function marshall(self,prefix,md,fid) % {{{
 
-                        WriteData(fid,prefix,'object',self,'fieldname','h','name','md.solidearth.love.h','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',self,'fieldname','k','name','md.solidearth.love.k','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',self,'fieldname','l','name','md.solidearth.love.l','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','h','name','md.solidearth.lovenumbers.h','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','k','name','md.solidearth.lovenumbers.k','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','l','name','md.solidearth.lovenumbers.l','format','DoubleMat','mattype',1);
 
-                        WriteData(fid,prefix,'object',self,'fieldname','th','name','md.solidearth.love.th','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',self,'fieldname','tk','name','md.solidearth.love.tk','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',self,'fieldname','tl','name','md.solidearth.love.tl','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',self,'data',self.tk2secular,'fieldname','love.tk2secular','format','Double');
+                        WriteData(fid,prefix,'object',self,'fieldname','th','name','md.solidearth.lovenumbers.th','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','tk','name','md.solidearth.lovenumbers.tk','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','tl','name','md.solidearth.lovenumbers.tl','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'data',self.tk2secular,'fieldname','lovenumbers.tk2secular','format','Double');
 
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
-                        writejs1Darray(fid,[modelname '.love.h'],self.h);
-                        writejs1Darray(fid,[modelname '.love.k'],self.k);
-                        writejs1Darray(fid,[modelname '.love.l'],self.l);
+                        writejs1Darray(fid,[modelname '.lovenumbers.h'],self.h);
+                        writejs1Darray(fid,[modelname '.lovenumbers.k'],self.k);
+                        writejs1Darray(fid,[modelname '.lovenumbers.l'],self.l);
                 end % }}}
                 function self = extrude(self,md) % {{{

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

@@ -9 +9 @@
                 settings               = solidearthsettings(); 
                 surfaceload            = surfaceload();
-                love                   = love();
+                lovenumbers            = lovenumbers();
                 rotational             = rotational();
                 planetradius           = planetradius('earth');
@@ -47 +47 @@
                         self.settings.checkconsistency(md,solution,analyses);
                         self.surfaceload.checkconsistency(md,solution,analyses);
-                        self.love.checkconsistency(md,solution,analyses);
+                        self.lovenumbers.checkconsistency(md,solution,analyses);
                         self.rotational.checkconsistency(md,solution,analyses);
 
@@ -64 +64 @@
                         self.settings.disp();
                         self.surfaceload.disp();
-                        self.love.disp();
+                        self.lovenumbers.disp();
                         self.rotational.disp();
 
@@ -76 +76 @@
                         self.settings.marshall(prefix,md,fid);
                         self.surfaceload.marshall(prefix,md,fid);
-                        self.love.marshall(prefix,md,fid);
+                        self.lovenumbers.marshall(prefix,md,fid);
                         self.rotational.marshall(prefix,md,fid);
                         
@@ -94 +94 @@
                         self.settings.savemodeljs(fid,modelname);
                         self.surfaceload.savemodeljs(fid,modelname);
-                        self.love.savemodeljs(fid,modelname);
+                        self.lovenumbers.savemodeljs(fid,modelname);
                         self.rotational.savemodeljs(fid,modelname);
                         writejscellstring(fid,[modelname '.solidearth.requested_outputs'],self.requested_outputs);