Changeset 25742 for issm/branches/trunk-larour-SLPS2020/src/m/classes/solidearth.m

Timestamp:

11/10/20 09:22:05 (4 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

File:

• issm/branches/trunk-larour-SLPS2020/src/m/classes/solidearth.m (modified) (5 diffs)

issm/branches/trunk-larour-SLPS2020/src/m/classes/solidearth.m

@@ -14 +14 @@
                 requested_outputs      = {};
                 transitions            = {};
+                partitionice              = [];
+                partitionhydro             = [];
         end
         methods
@@ -31 +33 @@
                 %transitions should be a cell array of vectors: 
                 self.transitions={};
+                
+                %no partitions requested for barystatic contribution: 
+                self.partitionice=[];
+                self.partitionhydro=[];
 
                 %earth radius
@@ -62 +68 @@
                         fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps');
                         fielddisplay(self,'requested_outputs','additional outputs requested');
+                        fielddisplay(self,'partitionice','ice partition vector for barystatic contribution');
+                        fielddisplay(self,'partitionhydro','hydro partition vector for barystatic contribution');
                         self.settings.disp();
                         self.surfaceload.disp();
@@ -73 +81 @@
                         WriteData(fid,prefix,'object',self,'fieldname','planetradius','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray');
+                
+                        if ~isempty(self.partitionice),
+                                npartice=max(self.partitionice)+2;
+                        else
+                                npartice=0;
+                        end
+                        if ~isempty(self.partitionhydro),
+                                nparthydro=max(self.partitionhydro)+2;
+                        else
+                                nparthydro=0;
+                        end
 
+                        
+                        WriteData(fid,prefix,'object',self,'fieldname','partitionice','mattype',1,'format','DoubleMat');
+                        WriteData(fid,prefix,'data',npartice,'format','Integer','name','md.solidearth.npartice');
+                        WriteData(fid,prefix,'object',self,'fieldname','partitionhydro','mattype',1,'format','DoubleMat');
+                        WriteData(fid,prefix,'data',nparthydro,'format','Integer','name','md.solidearth.nparthydro');
+                        
                         self.settings.marshall(prefix,md,fid);
                         self.surfaceload.marshall(prefix,md,fid);
@@ -98 +123 @@
                         writejscellstring(fid,[modelname '.solidearth.requested_outputs'],self.requested_outputs);
                         writejscellarray(fid,[modelname '.solidearth.transitions'],self.transitions);
+                        writejscellarray(fid,[modelname '.solidearth.partition'],self.partition);
                 end % }}}
                 function self = extrude(self,md) % {{{