Changeset 25400

Timestamp:

08/15/20 13:34:33 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: making friction and rheology B more flexible:

Location:

issm/trunk-jpl/src/m/classes

Files:

• friction.m (modified) (1 diff)
• inversionvalidation.m (modified) (1 diff)
• matice.m (modified) (1 diff)

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

@@ -82 +82 @@
 
                         WriteData(fid,prefix,'name','md.friction.law','data',1,'format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        if(size(self.coefficient,1)==md.mesh.numberofelements | size(self.coefficient,1)==md.mesh.numberofelements+1),
+                                mattype=2; tsl = md.mesh.numberofelements;
+                        else
+                                mattype=1; tsl = md.mesh.numberofvertices;
+                        end
+                        WriteData(fid,prefix,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',mattype,'timeserieslength',tsl+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','p','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2);

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

@@ -70 +70 @@
                         md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',supportedcostfunctions());
                         md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
-                        md = checkfield(md,'fieldname','inversion.min_parameters','size',[md.mesh.numberofvertices num_controls]);
-                        md = checkfield(md,'fieldname','inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
+                        md = checkfield(md,'fieldname','inversion.min_parameters','size',[NaN num_controls]);
+                        md = checkfield(md,'fieldname','inversion.max_parameters','size',[NaN num_controls]);
 
                         if strcmp(solution,'BalancethicknessSolution')

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

@@ -175 +175 @@
                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double');
                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','thermal_exchange_velocity','format','Double');
-                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        if(size(self.rheology_B,1)==md.mesh.numberofelements | size(self.rheology_B,1)==md.mesh.numberofelements+1),
+                                mattype=2; tsl = md.mesh.numberofelements;
+                        else
+                                mattype=1; tsl = md.mesh.numberofvertices;
+                        end
+                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',mattype,'timeserieslength',tsl+mattype,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'data',self.rheology_law,'name','md.materials.rheology_law','format','String');