Changeset 20500 for issm/trunk/src/m/classes/constants.m

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/constants.m (modified) (2 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

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

@@ -12 +12 @@
         end
         methods
-        function createxml(self,fid) % {{{
-            fprintf(fid, '\n\n');
-            fprintf(fid, '%s\n', '<!-- constants -->');
-                         fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="g" type="',class(self.g),'" default="',num2str(self.g),'">','     <section name="constants" />','     <help> gravitational acceleration [m/s^2] </help>','</parameter>');
-             fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="yts" type="',class(self.yts),'" default="',num2str(self.yts),'">','     <section name="constants" />','     <help> number of seconds in a year [s/yr] </help>','</parameter>');
-             fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','<parameter key ="referencetemperature" type="',class(self.referencetemperature),'" default="',num2str(self.referencetemperature),'">','     <section name="constants" />','     <help> reference temperature used in the enthalpy model [K] </help>','</parameter>');
-                end % }}}
                 function self = constants(varargin) % {{{
                         switch nargin
@@ -61 +54 @@
                 function marshall(self,md,fid) % {{{
                         WriteData(fid,'object',self,'fieldname','g','format','Double');
-                        WriteData(fid,'object',self,'fieldname','omega','format','Double');
                         WriteData(fid,'object',self,'fieldname','yts','format','Double');
                         WriteData(fid,'object',self,'fieldname','referencetemperature','format','Double');
                 end % }}}
+                function savemodeljs(self,fid,modelname) % {{{
+                
+                        writejsdouble(fid,[modelname '.constants.g'],self.g);
+                        writejsdouble(fid,[modelname '.constants.omega'],self.omega);
+                        writejsdouble(fid,[modelname '.constants.yts'],self.yts);
+                        writejsdouble(fid,[modelname '.constants.referencetemperature'],self.referencetemperature);
+
+                end % }}}
         end
 end

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad