Changeset 26062

Timestamp:

03/10/21 01:08:33 (4 years ago)

Author:

jdquinn

Message:

BUG: Call to function size; missing end

Location:

issm/trunk-jpl/src/m/classes

Files:

• geometry.m (modified) (1 diff)
• matice.m (modified) (2 diffs)

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

@@ -85 +85 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
-
-                        if (size(self.thickness)==md.mesh.numberofvertices) | (size(self.thickness)==md.mesh.numberofvertices+1)),
+                        length_thickness=size(self.thickness,1);
+                        if length_thickness==md.mesh.numberofvertices | length_thickness==md.mesh.numberofvertices+1,
                                 WriteData(fid,prefix,'object',self,'fieldname','thickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        elseif (size(self.thickness)==md.mesh.numberofelements) | (size(self.thickness)==md.mesh.numberofelements+1)),
+                        elseif length_thickness==md.mesh.numberofelements | length_thickness==md.mesh.numberofelements+1,
                                 WriteData(fid,prefix,'object',self,'fieldname','thickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
                         else

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

@@ -6 +6 @@
 classdef matice
         properties (SetAccess=public) 
-                rho_ice                    = 0.;
-                rho_water                  = 0.;
-                rho_freshwater             = 0.;
-                mu_water                   = 0.;
-                heatcapacity               = 0.;
-                latentheat                 = 0.;
-                thermalconductivity        = 0.;
-                temperateiceconductivity   = 0.;
+                rho_ice                         = 0.;
+                rho_water                       = 0.;
+                rho_freshwater                  = 0.;
+                mu_water                        = 0.;
+                heatcapacity                    = 0.;
+                latentheat                      = 0.;
+                thermalconductivity             = 0.;
+                temperateiceconductivity        = 0.;
                 effectiveconductivity_averaging = 0.;
-                meltingpoint               = 0.;
-                beta                       = 0.;
-                mixed_layer_capacity       = 0.;
-                thermal_exchange_velocity  = 0.;
-                rheology_B   = NaN;
-                rheology_n   = NaN;
-                rheology_law = '';
+                meltingpoint                    = 0.;
+                beta                            = 0.;
+                mixed_layer_capacity            = 0.;
+                thermal_exchange_velocity       = 0.;
+                rheology_B                      = NaN;
+                rheology_n                      = NaN;
+                rheology_law                    = '';
 
                 %slc
-                earth_density              = 0;
+                earth_density                   = 0;
 
         end
@@ -116 +116 @@
                                 md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'BuddJacka' 'Cuffey' 'CuffeyTemperate' 'Paterson' 'Arrhenius' 'LliboutryDuval' 'NyeCO2' 'NyeH2O'});
                                 md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0 1 2]);
+                        end
 
                 end % }}}