Changeset 26229

Timestamp:

05/03/21 09:37:43 (4 years ago)

Author:

Eric.Larour

Message:

CHG: basic checks + rate computation.

Location:

issm/trunk-jpl/src/m/classes

Files:

• offlinesolidearthsolution.m (modified) (1 diff)
• solidearthsettings.m (modified) (3 diffs)
• solidearthsolution.m (modified) (1 diff)

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

@@ -33 +33 @@
                 function marshall(self,prefix,md,fid) % {{{
                         disp(sprintf('   external (offlinesolidearthsolution) solution:'));
-                        WriteData(fid,prefix,'object',self,'data',2,'name','md.solidearth.external.nature','format','Integer'); %code 1 for offlinesolidearthsolution  class
+                        WriteData(fid,prefix,'data',2,'name','md.solidearth.external.nature','format','Integer'); %code 1 for offlinesolidearthsolution  class
                         self.marshall@solidearthsolution(prefix,md,fid);
                 end % }}}

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

@@ -15 +15 @@
                 runfrequency           = 1; %how many time steps we skip before we run grd_core
                 computesealevelchange  = 1; %will sea-level be coputed? 
-                isgrd                  = 1; %will GRD patterns be computed? 
-                compute_bp_grd         = 1; %will GRD patterns for bottom pressures be computed? 
+                isgrd                  = 0; %will GRD patterns be computed? 
+                compute_bp_grd         = 0; %will GRD patterns for bottom pressures be computed? 
                 degacc                 = 0; %degree increment for resolution of Green tables
                 horiz                  = 0; %compute horizontal deformation
@@ -45 +45 @@
                 self.rotation=1;
                 self.ocean_area_scaling=0;
-                self.compute_bp_grd=1;
+                self.compute_bp_grd=0;
                 self.isgrd=0;
                 self.computesealevelchange=1;
@@ -76 +76 @@
                         md = checkfield(md,'fieldname','solidearth.settings.degacc','size',[1 1],'>=',1e-10);
                         md = checkfield(md,'fieldname','solidearth.settings.horiz','NaN',1,'Inf',1,'values',[0 1]);
-                        md = checkfield(md,'fieldname','solidearth.settings.grdmodel','values',[1 2]);
+                        md = checkfield(md,'fieldname','solidearth.settings.grdmodel','>=',0,'<=',2);
                         md = checkfield(md,'fieldname','solidearth.settings.cross_section_shape','numel',[1],'values',[1,2]);
 

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

@@ -52 +52 @@
 
                         %transform our time series into time series rates 
-                        time=self.displacementeast(end,:);
-                        dt=diff(time,1,2);
+                        if size(self.displacementeast,2)==1
+                                disp('External solidearthsolution warning: only one time step provided, assuming the values are rates per year');
+                                displacementeast_rate=[self.displacementeast;0];
+                                displacementnorth_rate=[self.displacementnorth;0];
+                                displacementup_rate=[self.displacementup;0];
+                                geoid_rate=[self.geoid;0];
+                                barystaticsealevel_rate=[self.barystaticsealevel;0];
+                        else
+                                time=self.displacementeast(end,:);
+                                dt=diff(time,1,2);
+                                displacementeast_rate=diff(self.displacementeast(1:end-1,:),1,2)./dt;
+                                displacementeast_rate(end+1,:)=time(1:end-1);
+                                displacementnorth_rate=diff(self.displacementnorth(1:end-1,:),1,2)./dt;
+                                displacementnorth_rate(end+1,:)=time(1:end-1);
+                                displacementup_rate=diff(self.displacementup(1:end-1,:),1,2)./dt;
+                                displacementup_rate(end+1,:)=time(1:end-1);
+                                geoid_rate=diff(self.geoid(1:end-1,:),1,2)./dt;
+                                geoid_rate(end+1,:)=time(1:end-1);
+                                barystaticsealevel_rate=diff(self.barystaticsealevel(1:end-1,:),1,2)./dt;
+                                barystaticsealevel_rate(end+1,:)=time(1:end-1);
+                        end
+                        WriteData(fid,prefix,'object',self,'fieldname','displacementeast','data',displacementeast_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementeast','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','displacementup','data',displacementup_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementup','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','displacementnorth','data',displacementnorth_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementnorth','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','geoid','data',geoid_rate,'format','DoubleMat','name', 'md.solidearth.external.geoid','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','barystaticsealevel','data',barystaticsealevel_rate,'format','DoubleMat','name', 'md.solidearth.external.barystaticsealevel','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         
-                        displacementeast_rate=diff(displacementeast(1:end-1,:),1,2)./dt;
-                        displacementnorth_rate=diff(displacementnorth(1:end-1,:),1,2)./dt;
-                        displacementup_rate=diff(displacementup(1:end-1,:),1,2)./dt;
-                        geoid_rate=diff(geoid(1:end-1,:),1,2)./dt;
-                        barystaticsealevel_rate=diff(barystaticsealevel(1:end-1,:),1,2)./dt;
-
-                        WriteData(fid,prefix,'name','md.solidearth.external.displacementeast','data',displacementeast_rate,'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'name','md.solidearth.external.displacementup','data',displacementup_rate,'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'name','md.solidearth.external.displacementnorth','data',displacementnorth_rate,'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'name','md.solidearth.external.geoid','data',geoid_rate,'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'name','md.solidearth.external.barystaticsealevel','data',barystaticsealevel_rate,'format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-        
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{