Changeset 20500 for issm/trunk/src/m/classes/steadystate.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/steadystate.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/steadystate.m

@@ -11 +11 @@
         end
         methods
-        function createxml(self,fid) % {{{
-            fprintf(fid, '<!-- steadystate -->\n');            
-                    
-            % steadystate solution parameters
-            fprintf(fid,'%s\n%s\n%s\n','<frame key="1" label="steadystate solution parameters">','<section name="steadystate" />');                    
-                fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="reltol" type="',class(self.reltol),'" default="',convert2str(self.reltol),'">','     <section name="steadystate" />','     <help> relative tolerance criterion [K] </help>','  </parameter>');
-                fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="maxiter" type="',class(self.maxiter),'" default="',convert2str(self.maxiter),'">','     <section name="steadystate" />','     <help> maximum number of iterations </help>','  </parameter>');
-                fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="requested_outputs" type="',class(self.requested_outputs),'" default="',convert2str(self.requested_outputs),'">','     <section name="steadystate" />','     <help> additional requested outputs </help>','  </parameter>');
-            fprintf(fid,'%s\n%s\n','</frame>');    
-        
-        end % }}}
                 function self = steadystate(varargin) % {{{
                         switch nargin
@@ -80 +69 @@
                         WriteData(fid,'data',outputs,'enum',SteadystateRequestedOutputsEnum,'format','StringArray');
                 end % }}}
+                function savemodeljs(self,fid,modelname) % {{{
+                
+                        writejsdouble(fid,[modelname '.steadystate.reltol'],self.reltol);
+                        writejsdouble(fid,[modelname '.steadystate.maxiter'],self.maxiter);
+                        writejscellstring(fid,[modelname '.steadystate.requested_outputs'],self.requested_outputs);
+
+                end % }}}
         end
 end

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