Changeset 23699

Timestamp:

02/06/19 04:26:15 (6 years ago)

Author:

rueckamp

Message:

CHG: fixing typos

Location:

issm/trunk-jpl/src/m/classes

Files:

• matdamageice.py (modified) (2 diffs)
• matenhancedice.py (modified) (2 diffs)
• matestar.py (modified) (2 diffs)
• matice.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/matdamageice.py

@@ -52 +52 @@
                 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]"))
@@ -158 +158 @@
                 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')

issm/trunk-jpl/src/m/classes/matenhancedice.py

@@ -52 +52 @@
                 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]"))
@@ -161 +161 @@
                 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')

issm/trunk-jpl/src/m/classes/matestar.py

@@ -55 +55 @@
                 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]'))
@@ -165 +165 @@
                 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')

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

@@ -53 +53 @@
                 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]"))
@@ -159 +159 @@
                 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')