Changeset 26225

Timestamp:

04/29/21 14:27:33 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: adding .constants.gravitational_constant to python class

Location:

issm/trunk-jpl/src/m/classes

Files:

• constants.m (modified) (2 diffs)
• constants.py (modified) (4 diffs)

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

@@ -6 +6 @@
 classdef constants
         properties (SetAccess=public) 
-                g                    = 0.;
-                omega                = 0.;
-                yts                  = 0.;
-                referencetemperature = 0.;
+                g                      = 0.;
+                omega                  = 0.;
+                yts                    = 0.;
+                referencetemperature   = 0.;
                 gravitational_constant = 0.;
         end
@@ -35 +35 @@
                         self.referencetemperature=223.15;
                 
-                        %gravity: 
+                        %gravitational constant: 
                         self.gravitational_constant = 6.67259e-11;
 

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

@@ -13 +13 @@
 
     def __init__(self):  # {{{
-        self.g = 0.
-        self.omega = 0.
-        self.yts = 0.
-        self.referencetemperature = 0.
+        self.g                      = 0.
+        self.omega                  = 0.
+        self.yts                    = 0.
+        self.referencetemperature   = 0.
+        self.gravitational_constant = 0.;
 
-    #set defaults
+        #set defaults
         self.setdefaultparameters()
-
     #}}}
     def __repr__(self):  # {{{
@@ -29 +29 @@
         string = "%s\n%s" % (string, fielddisplay(self, "yts", "number of seconds in a year [s / yr]"))
         string = "%s\n%s" % (string, fielddisplay(self, "referencetemperature", "reference temperature used in the enthalpy model [K]"))
+        string = "%s\n%s" % (string, fielddisplay(self, "gravitational_constant", "Newtonian constant of gravitation [m^3/kg/s^2]"))
 
         return string
     #}}}
-
     def setdefaultparameters(self):  # {{{
         #acceleration due to gravity (m / s^2)
@@ -46 +46 @@
         self.referencetemperature = 223.15
 
+        #gravitational constant:
+        self.gravitational_constant = 6.67259e-11
+
         return self
     #}}}
-
     def checkconsistency(self, md, solution, analyses):  # {{{
         md = checkfield(md, 'fieldname', 'constants.g', '>=', 0, 'size', [1])
@@ -54 +56 @@
         md = checkfield(md, 'fieldname', 'constants.yts', '>', 0, 'size', [1])
         md = checkfield(md, 'fieldname', 'constants.referencetemperature', 'size', [1])
+        md = checkfield(md, 'fieldname', 'constants.gravitational_constant','size',[1]);
 
         return md
     # }}}
-
     def marshall(self, prefix, md, fid):  # {{{
         WriteData(fid, prefix, 'object', self, 'fieldname', 'g', 'format', 'Double')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'yts', 'format', 'Double')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'referencetemperature', 'format', 'Double')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'gravitational_constant', 'format', 'Double');
     # }}}