Changeset 26231

Timestamp:

05/03/21 14:43:16 (4 years ago)

Author:

caronlam

Message:

dsl class: no need to check consistency if transient.isoceantransport=0; solidearthsolution subclasses: fixing marshall for external.nature

Location:

issm/trunk-jpl/src/m/classes

Files:

• additionalsolidearthsolution.m (modified) (1 diff)
• dsl.m (modified) (1 diff)
• dslmme.m (modified) (1 diff)
• mmeadditionalsolidearthsolution.m (modified) (1 diff)
• mmeofflinesolidearthsolution.m (modified) (1 diff)
• offlinesolidearthsolution.m (modified) (1 diff)

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

@@ -32 +32 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
-                        WriteData(fid,prefix,'object',self,'data',1,'name','md.solidearth.external.nature','format','Integer'); %code 1 for additionalsolidearthsolution  class
+                        WriteData(fid,prefix,'data',1,'name','md.solidearth.external.nature','format','Integer'); %code 1 for additionalsolidearthsolution class
                         self.marshall@solidearthsolution(prefix,md,fid);
                 end % }}}

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

@@ -39 +39 @@
                         if ~ismember('SealevelchangeAnalysis',analyses), return; end
                         if (strcmp(solution,'TransientSolution') & md.transient.isslc == 0), return; end
+                        if (md.transient.isoceantransport==0) return;end
                         md = checkfield(md,'fieldname','dsl.global_average_thermosteric_sea_level','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','dsl.sea_surface_height_above_geoid','NaN',1,'Inf',1,'timeseries',1);

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

@@ -37 +37 @@
                         if ~ismember('SealevelchangeAnalysis',analyses), return; end
                         if (strcmp(solution,'TransientSolution') & md.transient.isslc == 0), return; end
+                        if (md.transient.isoceantransport==0) return;end
                         for i=1:length(self.global_average_thermosteric_sea_level),
                                 md = checkfield(md,'field',self.global_average_thermosteric_sea_level{i},'NaN',1,'Inf',1);

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

@@ -68 +68 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
-                        WriteData(fid,prefix,'object',self,'data',3,'name','md.solidearth.external.nature','format','Integer'); %code 3 for mmeadditionalsolidearthsolution  class
+                        WriteData(fid,prefix,'data',3,'name','md.solidearth.external.nature','format','Integer'); %code 3 for mmeadditionalsolidearthsolution class
+
                         nummodels=length(self.displacementeast);
                         WriteData(fid,prefix,'name','md.solidearth.external.nummodels','data',nummodels,'format','Integer');

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

@@ -68 +68 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
-                        WriteData(fid,prefix,'object',self,'data',4,'name','md.solidearth.external.nature','format','Integer'); %code 4 for mmeofflinesolidearthsolution  class
+                        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');
                         nummodels=length(self.displacementeast);

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

@@ -33 +33 @@
                 function marshall(self,prefix,md,fid) % {{{
                         disp(sprintf('   external (offlinesolidearthsolution) solution:'));
-                        WriteData(fid,prefix,'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 2 for offlinesolidearthsolution  class
                         self.marshall@solidearthsolution(prefix,md,fid);
                 end % }}}