Changeset 24313 for issm/trunk/src/m/classes/matestar.m

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/matestar.m (modified) (6 diffs)

issm/trunk/src/m/classes/matestar.m

@@ -14 +14 @@
                 thermalconductivity        = 0.;
                 temperateiceconductivity   = 0.;
+                effectiveconductivity_averaging = 0;
                 meltingpoint               = 0.;
                 beta                       = 0.;
@@ -90 +91 @@
                         self.temperateiceconductivity=.24;
 
+                        %computation of effective conductivity
+                        self.effectiveconductivity_averaging=1;
+            
                         %the melting point of ice at 1 atmosphere of pressure in K
                         self.meltingpoint=273.15;
@@ -125 +129 @@
                         md = checkfield(md,'fieldname','materials.rheology_Es','>',0,'size',[md.mesh.numberofvertices 1],'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'BuddJacka' 'Cuffey' 'CuffeyTemperate' 'Paterson' 'Arrhenius' 'LliboutryDuval'});
-
+                        md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0 1 2]);
+            
                         if ismember('GiaAnalysis',analyses),
                                 md = checkfield(md,'fieldname','materials.lithosphere_shear_modulus','>',0,'numel',1);
@@ -147 +152 @@
                         fielddisplay(self,'thermalconductivity',['ice thermal conductivity [W/m/K]']);
                         fielddisplay(self,'temperateiceconductivity','temperate ice thermal conductivity [W/m/K]');
+                        fielddisplay(self,'effectiveconductivity_averaging','computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)');
                         fielddisplay(self,'meltingpoint','melting point of ice at 1atm in K');
                         fielddisplay(self,'latentheat','latent heat of fusion [J/kg]');
@@ -172 +178 @@
                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','thermalconductivity','format','Double');
                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','temperateiceconductivity','format','Double');
+                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','effectiveconductivity_averaging','format','Integer');
                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','meltingpoint','format','Double');
                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','beta','format','Double');
@@ -197 +204 @@
                         writejsdouble(fid,[modelname '.materials.thermalconductivity'],self.thermalconductivity);
                         writejsdouble(fid,[modelname '.materials.temperateiceconductivity'],self.temperateiceconductivity);
+                        writejsdouble(fid,[modelname '.materials.effectiveconductivity_averaging'],self.effectiveconductivity_averaging);
                         writejsdouble(fid,[modelname '.materials.meltingpoint'],self.meltingpoint);
                         writejsdouble(fid,[modelname '.materials.beta'],self.beta);