Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 10974) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 10975) @@ -141,7 +141,7 @@ SettingsIoGatherEnum, SettingsLowmemEnum, SettingsOutputFrequencyEnum, - SettingsResultsOnVerticesEnum, + SettingsResultsAsPatchesEnum, SettingsWaitonlockEnum, SteadystateMaxiterEnum, SteadystateNumRequestedOutputsEnum, Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/Container/Elements.cpp =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/c/Container/Elements.cpp (revision 10974) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/Container/Elements.cpp (revision 10975) @@ -172,16 +172,16 @@ double *vector_serial= NULL; Vec vector = NULL; bool io_gather; - bool results_on_vertices; + bool results_as_patches; int numberofvertices; int numberofresults; /*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*/ /*OK, see what the first element of this partition has in stock (this is common to all partitions)*/ Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 10974) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 10975) @@ -143,7 +143,7 @@ else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; 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; else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 10974) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 10975) @@ -145,7 +145,7 @@ case SettingsIoGatherEnum : return "SettingsIoGather"; case SettingsLowmemEnum : return "SettingsLowmem"; case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency"; - case SettingsResultsOnVerticesEnum : return "SettingsResultsOnVertices"; + case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches"; case SettingsWaitonlockEnum : return "SettingsWaitonlock"; case SteadystateMaxiterEnum : return "SteadystateMaxiter"; case SteadystateNumRequestedOutputsEnum : return "SteadystateNumRequestedOutputs"; Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 10974) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 10975) @@ -70,7 +70,7 @@ parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofelementsEnum)); 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)); parameters->AddObject(iomodel->CopyConstantObject(TransientIsprognosticEnum)); Index: /proj/ice/larour/issm-uci/trunk-jpl/src/ad/validation/Update/update.m =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/ad/validation/Update/update.m (revision 10974) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/ad/validation/Update/update.m (revision 10975) @@ -4,7 +4,6 @@ md=setmask(md,'all',''); 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/']; Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsOnVerticesEnum.m =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsOnVerticesEnum.m (revision 10974) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsOnVerticesEnum.m (revision 10975) @@ -1,11 +0,0 @@ -function macro=SettingsResultsOnVerticesEnum() -%SETTINGSRESULTSONVERTICESENUM - Enum of SettingsResultsOnVertices -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=SettingsResultsOnVerticesEnum() - -macro=StringToEnum('SettingsResultsOnVertices'); Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuBedEnum.m =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuBedEnum.m (revision 0) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuBedEnum.m (revision 10975) @@ -0,0 +1,11 @@ +function macro=QmuBedEnum() +%QMUBEDENUM - Enum of QmuBed +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=QmuBedEnum() + +macro=StringToEnum('QmuBed'); Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuMeltingEnum.m =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuMeltingEnum.m (revision 0) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuMeltingEnum.m (revision 10975) @@ -0,0 +1,11 @@ +function macro=QmuMeltingEnum() +%QMUMELTINGENUM - Enum of QmuMelting +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=QmuMeltingEnum() + +macro=StringToEnum('QmuMelting'); Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuThicknessEnum.m =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuThicknessEnum.m (revision 0) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuThicknessEnum.m (revision 10975) @@ -0,0 +1,11 @@ +function macro=QmuThicknessEnum() +%QMUTHICKNESSENUM - Enum of QmuThickness +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=QmuThicknessEnum() + +macro=StringToEnum('QmuThickness'); Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsAsPatchesEnum.m =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsAsPatchesEnum.m (revision 0) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsAsPatchesEnum.m (revision 10975) @@ -0,0 +1,11 @@ +function macro=SettingsResultsAsPatchesEnum() +%SETTINGSRESULTSASPATCHESENUM - Enum of SettingsResultsAsPatches +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=SettingsResultsAsPatchesEnum() + +macro=StringToEnum('SettingsResultsAsPatches'); Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuSurfaceEnum.m =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuSurfaceEnum.m (revision 0) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuSurfaceEnum.m (revision 10975) @@ -0,0 +1,11 @@ +function macro=QmuSurfaceEnum() +%QMUSURFACEENUM - Enum of QmuSurface +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=QmuSurfaceEnum() + +macro=StringToEnum('QmuSurface'); Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m =================================================================== --- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m (revision 10974) +++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m (revision 10975) @@ -7,7 +7,7 @@ properties (SetAccess=public) io_gather = 0; lowmem = 0; - results_on_vertices = 0; + results_as_patches = 0; output_frequency = 0; waitonlock = 0; end @@ -38,6 +38,9 @@ %results frequency by default every step 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 %N minutes that is generated once the solution has converged @@ -48,7 +51,7 @@ 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); @@ -58,7 +61,7 @@ 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'); @@ -66,7 +69,7 @@ function marshall(obj,fid) % {{{ 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'); end % }}}