Changeset 27068

Timestamp:

06/16/22 17:14:21 (3 years ago)

Author:

Eric.Larour

Message:

CHG: debugging of mmeofflinesolidearthsolution for the first time. Also took
out the offline solution, was redundant.

Location:

issm/branches/trunk-larour-SLPS2022/src/m/classes

Files:

• additionalsolidearthsolution.m (deleted)
• mmeadditionalsolidearthsolution.m (deleted)
• mmeofflinesolidearthsolution.m (modified) (4 diffs)
• offlinesolidearthsolution.m (modified) (1 diff)

issm/branches/trunk-larour-SLPS2022/src/m/classes/mmeofflinesolidearthsolution.m

@@ -24 +24 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
-                        if ~ismember('SealevelchangeAnalysis',analyses) | (strcmp(solution,'TransientSolution') & md.solidearth.settings.isgrd==1), 
-                                error('mmeofflinesolidearthsolution checkconsistency error message: trying to run GRD patterns while supplying an offline solution for those patterns!'); 
-                        end
-                        
                         seast=length(self.displacementeast);
                         snorth=length(self.displacementnorth);
@@ -61 +57 @@
                         fielddisplay(self,'modelid','index into the multi-model ensemble, determines which field will be used.');
                 end % }}}
+                function s=nummodels(self) % {{{
+                        s=numel(self.displacementup);
+                end % }}}
                 function marshall(self,prefix,md,fid) % {{{
                         WriteData(fid,prefix,'data',4,'name','md.solidearth.external.nature','format','Integer'); %code 4 for mmeofflinesolidearthsolution class
-                        WriteData(fid,prefix,'object',self,'fieldname','modelid','format','Double');
+                        WriteData(fid,prefix,'data',self.modelid,'name','md.solidearth.external.modelid','format','Integer');
                         nummodels=length(self.displacementeast);
                         WriteData(fid,prefix,'name','md.solidearth.external.nummodels','data',nummodels,'format','Integer');
@@ -77 +76 @@
                                 dt=diff(time,1,2);
                                 
-                                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;
+                                displacementeast_rate=[diff(displacementeast(1:end-1,:),1,2)./dt;time(1:end-1)];
+                                displacementnorth_rate=[diff(displacementnorth(1:end-1,:),1,2)./dt;time(1:end-1)];
+                                displacementup_rate=[diff(displacementup(1:end-1,:),1,2)./dt;time(1:end-1)];
+                                geoid_rate=[diff(geoid(1:end-1,:),1,2)./dt;time(1:end-1)];
 
                                 self.displacementeast{i}=displacementeast_rate; 
@@ -88 +86 @@
                                 self.geoid{i}=geoid_rate; 
                         end
-                        
-                        WriteData(fid,prefix,'object',self,'fieldname','displacementeast','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
-                        WriteData(fid,prefix,'object',self,'fieldname','displacementup','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
-                        WriteData(fid,prefix,'object',self,'fieldname','displacementnorth','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
-                        WriteData(fid,prefix,'object',self,'fieldname','geoid','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
+                        yts=md.constants.yts;
+                        WriteData(fid,prefix,'data',self.displacementeast,'name','md.solidearth.external.displacementeast','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',yts,'scale',1/yts);
+                        WriteData(fid,prefix,'data',self.displacementup,'name','md.solidearth.external.displacementup','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',yts,'scale',1/yts);
+                        WriteData(fid,prefix,'data',self.displacementnorth,'name','md.solidearth.external.displacementnorth','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',yts,'scale',1/yts);
+                        WriteData(fid,prefix,'data',self.geoid,'name','md.solidearth.external.geoid','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',yts,'scale',1/yts);
 
                 end % }}}

issm/branches/trunk-larour-SLPS2022/src/m/classes/offlinesolidearthsolution.m

@@ -21 +21 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
-                        if ~ismember('SealevelchangeAnalysis',analyses) | (strcmp(solution,'TransientSolution') & md.solidearth.settings.isgrd==1), 
-                                error('offlinesolidearthsolution.m::checkconsistency: trying to run GRD patterns while supplying an offline solution for those patterns!'); 
-                        end
                         self.checkconsistency@solidearthsolution(md,solution,analyses);