Changeset 22297

Timestamp:

12/21/17 15:14:34 (7 years ago)

Author:

Mathieu Morlighem

Message:

BUG: had to convert some issmsettings back to settings

File:

• issm/trunk-jpl/src/m/classes/issmsettings.m (modified) (2 diffs)

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

@@ -57 +57 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
-                        md = checkfield(md,'fieldname','issmsettings.results_on_nodes','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'fieldname','issmsettings.io_gather','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'fieldname','issmsettings.lowmem','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'fieldname','issmsettings.output_frequency','numel',[1],'>=',1);
-                        md = checkfield(md,'fieldname','issmsettings.recording_frequency','numel',[1],'>=',0);
-                        md = checkfield(md,'fieldname','issmsettings.waitonlock','numel',[1]);
-                        md = checkfield(md,'fieldname','issmsettings.solver_residue_threshold','numel',[1],'>',0);
+                        md = checkfield(md,'fieldname','settings.results_on_nodes','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','settings.io_gather','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','settings.lowmem','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','settings.output_frequency','numel',[1],'>=',1);
+                        md = checkfield(md,'fieldname','settings.recording_frequency','numel',[1],'>=',0);
+                        md = checkfield(md,'fieldname','settings.waitonlock','numel',[1]);
+                        md = checkfield(md,'fieldname','settings.solver_residue_threshold','numel',[1],'>',0);
 
                 end % }}}
@@ -84 +84 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
-                        WriteData(fid,prefix,'object',self,'fieldname','results_on_nodes','format','Boolean');
-                        WriteData(fid,prefix,'object',self,'fieldname','io_gather','format','Boolean');
-                        WriteData(fid,prefix,'object',self,'fieldname','lowmem','format','Boolean');
-                        WriteData(fid,prefix,'object',self,'fieldname','output_frequency','format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','recording_frequency','format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','waitonlock','data',self.waitonlock>0,'format','Boolean');
-                        WriteData(fid,prefix,'object',self,'fieldname','solver_residue_threshold','format','Double');
+                        WriteData(fid,prefix,'object',self,'class','settings','fieldname','results_on_nodes','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'class','settings','fieldname','io_gather','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'class','settings','fieldname','lowmem','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'class','settings','fieldname','output_frequency','format','Integer');
+                        WriteData(fid,prefix,'object',self,'class','settings','fieldname','recording_frequency','format','Integer');
+                        WriteData(fid,prefix,'object',self,'class','settings','fieldname','waitonlock','data',self.waitonlock>0,'format','Boolean');
+                        WriteData(fid,prefix,'object',self,'class','settings','fieldname','solver_residue_threshold','format','Double');
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
                 
-                        writejsdouble(fid,[modelname '.issmsettings.results_on_nodes'],self.results_on_nodes);
-                        writejsdouble(fid,[modelname '.issmsettings.io_gather'],self.io_gather);
-                        writejsdouble(fid,[modelname '.issmsettings.lowmem'],self.lowmem);
-                        writejsdouble(fid,[modelname '.issmsettings.output_frequency'],self.output_frequency);
-                        writejsdouble(fid,[modelname '.issmsettings.recording_frequency'],self.recording_frequency);
-                        writejsdouble(fid,[modelname '.issmsettings.waitonlock'],self.waitonlock);
-                        writejsstring(fid,[modelname '.issmsettings.upload_server'],self.upload_server);
-                        writejsstring(fid,[modelname '.issmsettings.upload_path'],self.upload_path);
-                        writejsstring(fid,[modelname '.issmsettings.upload_login'],self.upload_login);
-                        writejsdouble(fid,[modelname '.issmsettings.upload_port'],self.upload_port);
-                        writejsstring(fid,[modelname '.issmsettings.upload_filename'],self.upload_filename);
-                        writejsstring(fid,[modelname '.issmsettings.solver_residue_threshold'],self.solver_residue_threshold);
+                        writejsdouble(fid,[modelname '.settings.results_on_nodes'],self.results_on_nodes);
+                        writejsdouble(fid,[modelname '.settings.io_gather'],self.io_gather);
+                        writejsdouble(fid,[modelname '.settings.lowmem'],self.lowmem);
+                        writejsdouble(fid,[modelname '.settings.output_frequency'],self.output_frequency);
+                        writejsdouble(fid,[modelname '.settings.recording_frequency'],self.recording_frequency);
+                        writejsdouble(fid,[modelname '.settings.waitonlock'],self.waitonlock);
+                        writejsstring(fid,[modelname '.settings.upload_server'],self.upload_server);
+                        writejsstring(fid,[modelname '.settings.upload_path'],self.upload_path);
+                        writejsstring(fid,[modelname '.settings.upload_login'],self.upload_login);
+                        writejsdouble(fid,[modelname '.settings.upload_port'],self.upload_port);
+                        writejsstring(fid,[modelname '.settings.upload_filename'],self.upload_filename);
+                        writejsstring(fid,[modelname '.settings.solver_residue_threshold'],self.solver_residue_threshold);
                 end % }}}
         end