Changeset 10975

Timestamp:

11/29/11 16:50:56 (13 years ago)

Author:

Mathieu Morlighem

Message:

moved md.settings.results_on_vertices to md.settings.results_as_patches which is 0 by default

Location:

issm/trunk-jpl/src

Files:

• ad/validation/Update/update.m (modified) (1 diff)
• c/Container/Elements.cpp (modified) (2 diffs)
• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• m/classes/settings.m (modified) (5 diffs)
• m/enum/QmuBedEnum.m (added)
• m/enum/QmuMeltingEnum.m (added)
• m/enum/QmuSurfaceEnum.m (added)
• m/enum/QmuThicknessEnum.m (added)
• m/enum/SettingsResultsAsPatchesEnum.m (added)
• m/enum/SettingsResultsOnVerticesEnum.m (deleted)

issm/trunk-jpl/src/ad/validation/Update/update.m

@@ -5 +5 @@
 md=parameterize(md,'SquareShelfConstrained.par');
 md=setflowequation(md,'macayeal','all');
-md.settings.results_on_vertices=1;
 md.cluster=generic('name',oshostname(),'np',3);
 md.cluster.executionpath=[issmtier() '/src/ad/validation/Validation/'];

issm/trunk-jpl/src/c/Container/Elements.cpp

@@ -173 +173 @@
         Vec     vector       = NULL;
         bool   io_gather;
-        bool   results_on_vertices;
+        bool   results_as_patches;
         int    numberofvertices;
         int    numberofresults;
@@ -179 +179 @@
         /*Recover parameters: */
         parameters->FindParam(&io_gather,SettingsIoGatherEnum);
-        parameters->FindParam(&results_on_vertices,SettingsResultsOnVerticesEnum);
+        parameters->FindParam(&results_as_patches,SettingsResultsAsPatchesEnum);
         parameters->FindParam(&numberofvertices,MeshNumberofverticesEnum);
 
-        if(results_on_vertices){
+        if(!results_as_patches){
                 /*No patch here, we prepare vectors*/
 

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -142 +142 @@
         SettingsLowmemEnum,
         SettingsOutputFrequencyEnum,
-        SettingsResultsOnVerticesEnum,
+        SettingsResultsAsPatchesEnum,
         SettingsWaitonlockEnum,
         SteadystateMaxiterEnum,

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -146 +146 @@
                 case SettingsLowmemEnum : return "SettingsLowmem";
                 case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency";
-                case SettingsResultsOnVerticesEnum : return "SettingsResultsOnVertices";
+                case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches";
                 case SettingsWaitonlockEnum : return "SettingsWaitonlock";
                 case SteadystateMaxiterEnum : return "SteadystateMaxiter";

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -71 +71 @@
         parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofverticesEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsIoGatherEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SettingsResultsOnVerticesEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(SettingsResultsAsPatchesEnum));
         parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMigrationEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsdiagnosticEnum));

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -144 +144 @@
         else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
         else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
-        else if (strcmp(name,"SettingsResultsOnVertices")==0) return SettingsResultsOnVerticesEnum;
+        else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum;
         else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
         else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;

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

@@ -8 +8 @@
                 io_gather           = 0;
                 lowmem              = 0;
-                results_on_vertices = 0;
+                results_as_patches  = 0;
                 output_frequency    = 0;
                 waitonlock          = 0;
@@ -39 +39 @@
                         obj.output_frequency=1;
 
+                        %do not use patches by default (difficult to plot)
+                        obj.results_as_patches=0;
+
                         %this option can be activated to load automatically the results
                         %onto the model after a parallel run by waiting for the lock file
@@ -49 +52 @@
                         checkfield(md,'settings.io_gather','numel',1,'values',[0 1]);
                         checkfield(md,'settings.lowmem','numel',1,'values',[0 1]);
-                        checkfield(md,'settings.results_on_vertices','numel',1,'values',[0 1]);
+                        checkfield(md,'settings.results_as_patches','numel',1,'values',[0 1]);
                         checkfield(md,'settings.output_frequency','numel',1,'>=',1);
                         checkfield(md,'settings.waitonlock','numel',1);
@@ -59 +62 @@
                         fielddisplay(obj,'io_gather','I/O gathering strategy for result outputs (default 1)');
                         fielddisplay(obj,'lowmem','is the memory limited ? (0 or 1)');
-                        fielddisplay(obj,'results_on_vertices','provide results on vertices instead of patch (0 or 1)');
+                        fielddisplay(obj,'results_as_patches','provide results as patches for each element (0 or 1)');
                         fielddisplay(obj,'output_frequency','frequency at which results are saved in all solutions with multiple time_steps');
                         fielddisplay(obj,'waitonlock','maximum number of minutes to wait for batch results, or return 0');
@@ -67 +70 @@
                         WriteData(fid,'object',obj,'fieldname','io_gather','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','lowmem','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','results_on_vertices','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','results_as_patches','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','output_frequency','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','waitonlock','format','Boolean');