Changeset 22383

Timestamp:

02/01/18 11:01:30 (7 years ago)

Author:

adhikari

Message:

NEW: extracting love numbers at depth

Location:

issm/trunk-jpl/src/m

Files:

• classes/fourierlove.js (modified) (5 diffs)
• classes/fourierlove.m (modified) (5 diffs)
• classes/fourierlove.py (modified) (5 diffs)
• solve/parseresultsfromdisk.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/fourierlove.js

@@ -19 +19 @@
                 this.mu0=10**11; // Pa
                 this.allow_layer_deletion=1; 
+                this.love_kernels=0; 
                 this.forcing_type = 11; 
         } // }}}
@@ -30 +31 @@
                 fielddisplay(this,'mu0','adimensioning constant for stress (default 10^11) [Pa]');
                 fielddisplay(this,'allow_layer_deletion','allow for migration of the integration boundary with increasing spherical harmonics degree (default 1)');
+                fielddisplay(this,'love_kernels','compute love numbers at depth? (default 0)');
                 fielddisplay(this,'forcing_type',['integer indicating the nature and depth of the forcing for the Love number calculation (default 11) :','1:  Inner core boundary -- Volumic Potential','2:  Inner core boundary -- Pressure','3:  Inner core boundary -- Loading','4:  Inner core boundary -- Tangential traction','5:  Core mantle boundary -- Volumic Potential','6:  Core mantle boundary -- Pressure','7:  Core mantle boundary -- Loading','8:  Core mantle boundary -- Tangential traction','9:  Surface -- Volumic Potential','10: Surface -- Pressure','11: Surface -- Loading','12: Surface -- Tangential traction ']); 
 
@@ -43 +45 @@
                 md = checkfield(md,'fieldname','love.mu0','NaN',1,'Inf',1,'numel',1,'>',0);
                 md = checkfield(md,'fieldname','love.allow_layer_deletion','values',[0, 1]);
+                md = checkfield(md,'fieldname','love.love_kernels','values',[0, 1]);
                 md = checkfield(md,'fieldname','love.forcing_type','NaN',1,'Inf',1,'numel',1,'>',0, '<=', 12);
                 if (md.love.sh_nmin<=1 && md.love.forcing_type==9) {
@@ -58 +61 @@
                 WriteData(fid,prefix,'object',this,'fieldname','mu0','format','Double');
                 WriteData(fid,prefix,'object',this,'fieldname','allow_layer_deletion','format','Boolean');
+                WriteData(fid,prefix,'object',this,'fieldname','love_kernels','format','Boolean');
                 WriteData(fid,prefix,'object',this,'fieldname','forcing_type','format','Integer');
 
@@ -72 +76 @@
         this.mu0                  =  NaN;
         this.allow_layer_deletion =  NaN;
+        this.love_kernels =  NaN;
         this.forcing_type         =  NaN;
         

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

@@ -13 +13 @@
                 r0               =  NaN; 
                 mu0              =  NaN;
-        allow_layer_deletion = NaN;
+      allow_layer_deletion = NaN;
+      love_kernels = NaN;
                 forcing_type     =  NaN;
         end
@@ -43 +44 @@
                         self.mu0=10^11; % Pa
                         self.allow_layer_deletion=1; 
+                        self.love_kernels=0; 
                         self.forcing_type = 11; 
                 end % }}}
@@ -54 +56 @@
                         fielddisplay(self,'mu0','adimensioning constant for stress (default 10^11) [Pa]');
                         fielddisplay(self,'allow_layer_deletion','allow for migration of the integration boundary with increasing spherical harmonics degree (default 1)');
+                        fielddisplay(self,'love_kernels','compute love numbers at depth? (default 0)');
                         fielddisplay(self,'forcing_type',{'integer indicating the nature and depth of the forcing for the Love number calculation (default 11) :','1:  Inner core boundary -- Volumic Potential','2:  Inner core boundary -- Pressure','3:  Inner core boundary -- Loading','4:  Inner core boundary -- Tangential traction','5:  Core mantle boundary -- Volumic Potential','6:  Core mantle boundary -- Pressure','7:  Core mantle boundary -- Loading','8:  Core mantle boundary -- Tangential traction','9:  Surface -- Volumic Potential','10: Surface -- Pressure','11: Surface -- Loading','12: Surface -- Tangential traction '}); 
 
@@ -67 +70 @@
                         md = checkfield(md,'fieldname','love.mu0','NaN',1,'Inf',1,'numel',1,'>',0);
                         md = checkfield(md,'fieldname','love.allow_layer_deletion','values',[0 1]);
+                        md = checkfield(md,'fieldname','love.love_kernels','values',[0 1]);
                         md = checkfield(md,'fieldname','love.forcing_type','NaN',1,'Inf',1,'numel',1,'>',0, '<=', 12);
                         if md.love.sh_nmin<=1 & md.love.forcing_type==9
@@ -82 +86 @@
                         WriteData(fid,prefix,'object',self,'fieldname','mu0','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','allow_layer_deletion','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','love_kernels','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','forcing_type','format','Integer');
 

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

@@ -20 +20 @@
                 self.mu0                  =  float('NaN');
                 self.allow_layer_deletion = float('NaN');
+                self.love_kernels = float('NaN');
                 self.forcing_type         =  float('NaN');
 
@@ -38 +39 @@
                 string="%s\n%s"%(string,fielddisplay(self,'mu0','adimensioning constant for stress (default 10^11) [Pa]'))
                 string="%s\n%s"%(string,fielddisplay(self,'allow_layer_deletion','allow for migration of the integration boundary with increasing spherical harmonics degree (default 1)'))
+                string="%s\n%s"%(string,fielddisplay(self,'love_kernels','compute love numbers at depth? (default 0)'))
                 string="%s\n%s"%(string,fielddisplay(self,'forcing_type','integer indicating the nature and depth of the forcing for the Love number calculation (default 11) :'))
                 string="%s\n%s"%(string,'                                                     1:  Inner core boundary -- Volumic Potential')
@@ -70 +72 @@
             self.mu0=1e11 # Pa
             self.allow_layer_deletion=1
+            self.love_kernels=0 
             self.forcing_type = 11
 
@@ -84 +87 @@
             md = checkfield(md,'fieldname','love.mu0','NaN',1,'Inf',1,'numel',[1],'>',0);
             md = checkfield(md,'fieldname','love.allow_layer_deletion','values',[0,1]);
+            md = checkfield(md,'fieldname','love.love_kernels','values',[0,1]);
             md = checkfield(md,'fieldname','love.forcing_type','NaN',1,'Inf',1,'numel',[1],'>',0, '<=', 12);
             if md.love.sh_nmin<=1 and md.love.forcing_type==9:
@@ -100 +104 @@
             WriteData(fid,prefix,'object',self,'fieldname','mu0','format','Double');
             WriteData(fid,prefix,'object',self,'fieldname','allow_layer_deletion','format','Boolean');
+            WriteData(fid,prefix,'object',self,'fieldname','love_kernels','format','Boolean');
             WriteData(fid,prefix,'object',self,'fieldname','forcing_type','format','Integer');
 

issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m

@@ -211 +211 @@
         elseif strcmp(fieldname,'CalvingCalvingrate'),
                 field = field*yts;
+        elseif (strcmp(fieldname,'LoveKernelsReal') | strcmp(fieldname,'LoveKernelsImag')),
+                nlayer = md.materials.numlayers; 
+                degmax = md.love.sh_nmax; 
+                nfreq  = md.love.nfreq; 
+                temp_field = cell(degmax+1,nfreq,nlayer+1,6); 
+                for ii=1:degmax+1
+                        for jj=1:nfreq
+                                for kk=1:nlayer+1
+                                        ll = (ii-1)*(nlayer+1)*6 + ((kk-1)*6+1); 
+                                        for mm=1:6
+                                                temp_field{ii,jj,kk,mm} = field(ll+(mm-1),jj);  
+                                        end
+                                end
+                        end
+                end
+                field=temp_field; 
         end