Index: ../trunk-jpl/src/m/classes/matice.py =================================================================== --- ../trunk-jpl/src/m/classes/matice.py (revision 23698) +++ ../trunk-jpl/src/m/classes/matice.py (revision 23699) @@ -52,7 +52,7 @@ string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]")) string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]")) string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]")) - string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)") + string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)")) string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K")) string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]")) string="%s\n%s"%(string,fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]")) @@ -158,7 +158,7 @@ WriteData(fid,prefix,'object',self,'class','materials','fieldname','latentheat','format','Double') 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','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') WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double') Index: ../trunk-jpl/src/m/classes/matestar.py =================================================================== --- ../trunk-jpl/src/m/classes/matestar.py (revision 23698) +++ ../trunk-jpl/src/m/classes/matestar.py (revision 23699) @@ -54,7 +54,7 @@ string="%s\n%s"%(string,fielddisplay(self,'heatcapacity','heat capacity [J/kg/K]')) string="%s\n%s"%(string,fielddisplay(self,'thermalconductivity',['ice thermal conductivity [W/m/K]'])) string="%s\n%s"%(string,fielddisplay(self,'temperateiceconductivity','temperate ice thermal conductivity [W/m/K]')) - string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)") + string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)")) string="%s\n%s"%(string,fielddisplay(self,'meltingpoint','melting point of ice at 1atm in K')) string="%s\n%s"%(string,fielddisplay(self,'latentheat','latent heat of fusion [J/kg]')) string="%s\n%s"%(string,fielddisplay(self,'beta','rate of change of melting point with pressure [K/Pa]')) @@ -164,7 +164,7 @@ WriteData(fid,prefix,'object',self,'class','materials','fieldname','latentheat','format','Double') 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','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') WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double') Index: ../trunk-jpl/src/m/classes/matdamageice.py =================================================================== --- ../trunk-jpl/src/m/classes/matdamageice.py (revision 23698) +++ ../trunk-jpl/src/m/classes/matdamageice.py (revision 23699) @@ -51,7 +51,7 @@ string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]")) string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]")) string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]")) - string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)") + string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)")) string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K")) string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]")) string="%s\n%s"%(string,fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]")) @@ -157,7 +157,7 @@ WriteData(fid,prefix,'object',self,'class','materials','fieldname','latentheat','format','Double') 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','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') WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double') Index: ../trunk-jpl/src/m/classes/matenhancedice.py =================================================================== --- ../trunk-jpl/src/m/classes/matenhancedice.py (revision 23698) +++ ../trunk-jpl/src/m/classes/matenhancedice.py (revision 23699) @@ -51,7 +51,7 @@ string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]")) string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]")) string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]")) - string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)") + string="%s\n%s"%(string,fielddisplay(self,"effectiveconductivity_averaging","computation of effective conductivity: (0) arithmetic mean, (1) harmonic mean, (2) geometric mean (default)")) string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K")) string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]")) string="%s\n%s"%(string,fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]")) @@ -160,7 +160,7 @@ WriteData(fid,prefix,'object',self,'class','materials','fieldname','latentheat','format','Double') 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','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') WriteData(fid,prefix,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double')