Changeset 9622

Timestamp:

09/06/11 14:12:11 (14 years ago)

Author:

seroussi

Message:

added settings object

Location:

issm/trunk/src

Files:

• c/Container/Elements.cpp (modified) (1 diff)
• c/Container/Results.cpp (modified) (1 diff)
• c/EnumDefinitions/EnumDefinitions.h (modified) (3 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• c/modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (3 diffs)
• c/solvers/solver_thermal_nonlinear.cpp (modified) (1 diff)
• m/classes/clusters/generic.m (modified) (1 diff)
• m/classes/clusters/pfe.m (modified) (2 diffs)
• m/classes/model/model.m (modified) (6 diffs)
• m/classes/settings.m (added)
• m/enum/IoGatherEnum.m (deleted)
• m/enum/LowmemEnum.m (deleted)
• m/enum/SettingsIoGatherEnum.m (added)
• m/enum/SettingsLowmemEnum.m (added)
• m/model/ismodelselfconsistent.m (modified) (3 diffs)
• m/model/loadresultsfromdisk.m (modified) (1 diff)

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

@@ -175 +175 @@
 
         /*Recover parameters: */
-        parameters->FindParam(&io_gather,IoGatherEnum);
+        parameters->FindParam(&io_gather,SettingsIoGatherEnum);
 
         /*create patch object out of all results in this dataset: */

issm/trunk/src/c/Container/Results.cpp

@@ -162 +162 @@
         /*Recover file descriptor: */
         parameters->FindParam(&fid,OutputFilePointerEnum);
-        parameters->FindParam(&io_gather,IoGatherEnum);
+        parameters->FindParam(&io_gather,SettingsIoGatherEnum);
 
         for(i=0;i<this->Size();i++){

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

@@ -32 +32 @@
         HydrologyQEnum,
         HydrologyCREnum,
+        SettingsLowmemEnum,
+        SettingsIoGatherEnum,
         /*}}}*/
         /*Datasets {{{1*/
@@ -289 +291 @@
         WaterColumnOldEnum,
         /*}}}*/
-        /*Io{{{1*/
-        IoGatherEnum,
-        /*}}}*/
         /*Responses{{{1*/
         MinVelEnum,
@@ -347 +346 @@
         EpsRelEnum,
         EpsResEnum,
-        LowmemEnum,
         MaxNonlinearIterationsEnum,
         MinMechanicalConstraintsEnum,

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

@@ -36 +36 @@
                 case HydrologyQEnum : return "HydrologyQ";
                 case HydrologyCREnum : return "HydrologyCR";
+                case SettingsLowmemEnum : return "SettingsLowmem";
+                case SettingsIoGatherEnum : return "SettingsIoGather";
                 case ConstraintsEnum : return "Constraints";
                 case ElementsEnum : return "Elements";
@@ -251 +253 @@
                 case OutputFrequencyEnum : return "OutputFrequency";
                 case WaterColumnOldEnum : return "WaterColumnOld";
-                case IoGatherEnum : return "IoGather";
                 case MinVelEnum : return "MinVel";
                 case MaxVelEnum : return "MaxVel";
@@ -296 +297 @@
                 case EpsRelEnum : return "EpsRel";
                 case EpsResEnum : return "EpsRes";
-                case LowmemEnum : return "Lowmem";
                 case MaxNonlinearIterationsEnum : return "MaxNonlinearIterations";
                 case MinMechanicalConstraintsEnum : return "MinMechanicalConstraints";

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

@@ -42 +42 @@
         parameters->AddObject(iomodel->CopyConstantObject(HydrostaticAdjustmentEnum));
         parameters->AddObject(iomodel->CopyConstantObject(PenaltyOffsetEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(LowmemEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ConnectivityEnum));
         parameters->AddObject(iomodel->CopyConstantObject(BetaEnum));
@@ -59 +59 @@
         parameters->AddObject(iomodel->CopyConstantObject(WaitonlockEnum));
         parameters->AddObject(iomodel->CopyConstantObject(NumberOfElementsEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(IoGatherEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(SettingsIoGatherEnum));
         parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMigrationEnum));
         parameters->AddObject(iomodel->CopyConstantObject(IsdiagnosticEnum));

issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -72 +72 @@
 
                 /*What strategy? : */
-                parameters->FindParam(&io_gather,IoGatherEnum);
+                parameters->FindParam(&io_gather,SettingsIoGatherEnum);
 
                 if(io_gather){

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

@@ -34 +34 @@
         else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum;
         else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum;
+        else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
+        else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
         else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
         else if (strcmp(name,"Elements")==0) return ElementsEnum;
@@ -249 +251 @@
         else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum;
         else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
-        else if (strcmp(name,"IoGather")==0) return IoGatherEnum;
         else if (strcmp(name,"MinVel")==0) return MinVelEnum;
         else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
@@ -294 +295 @@
         else if (strcmp(name,"EpsRel")==0) return EpsRelEnum;
         else if (strcmp(name,"EpsRes")==0) return EpsResEnum;
-        else if (strcmp(name,"Lowmem")==0) return LowmemEnum;
         else if (strcmp(name,"MaxNonlinearIterations")==0) return MaxNonlinearIterationsEnum;
         else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum;

issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -38 +38 @@
         /*Recover parameters: */
         kflag=1; pflag=1;
-        femmodel->parameters->FindParam(&lowmem,LowmemEnum);
+        femmodel->parameters->FindParam(&lowmem,SettingsLowmemEnum);
         femmodel->parameters->FindParam(&min_thermal_constraints,MinThermalConstraintsEnum);
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);

issm/trunk/src/m/classes/clusters/generic.m

@@ -100 +100 @@
                          end
 
-                         if ~md.io_gather,
+                         if ~md.settings.io_gather,
                                  %concatenate the output files:
                                  fprintf(fid,'\ncat %s.outbin.* > %s.outbin',modelname,modelname);

issm/trunk/src/m/classes/clusters/pfe.m

@@ -140 +140 @@
                          fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname);
 
-                         if ~md.io_gather,
+                         if ~md.settings.io_gather,
                                  %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -157 +157 @@
                                  end
 
-                                 if ~md.io_gather,
+                                 if ~md.settings.io_gather,
                                          %concatenate the output files:
                                          fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);

issm/trunk/src/m/classes/model/model.m

@@ -21 +21 @@
                  rifts     = modelfield('default',0,'marshall',true);
                  hydrology = modelfield('default',0,'marshall',true);
+                 settings  = modelfield('default',0,'marshall',true);
                  radaroverlay = modelfield('default',0,'marshall',false);
 
@@ -43 +44 @@
                  edges               = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
 
-                 %I/O
-                 io_gather           = modelfield('default',0,'marshall',true,'format','Boolean');
-
                  %Initial 2d mesh 
                  numberofelements2d = modelfield('default',0,'marshall',true,'format','Integer');
@@ -162 +160 @@
                  max_steadystate_iterations = modelfield('default',0,'marshall',true,'format','Integer');
                  connectivity             = modelfield('default',0,'marshall',true,'format','Integer');
-                 lowmem                   = modelfield('default',0,'marshall',true,'format','Boolean');
                  viscosity_overshoot      = modelfield('default',0,'marshall',true,'format','Double');
 
@@ -537 +534 @@
                          md.rifts=rifts;
                          md.hydrology=hydrology;
+                         md.settings=settings;
                          md.radaroverlay=radaroverlay;
 
@@ -597 +595 @@
                          md.connectivity=25;
 
-                         %lowmem??
-                         md.lowmem=0;
-
                          %coefficient to update the viscosity between each iteration of
                          %a diagnostic according to the following formula
@@ -719 +714 @@
                          md.rheology_law='Paterson';
 
-                         %i/o:
-                         md.io_gather=1;
                  end
                  %}}}

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -83 +83 @@
 %NO NAN {{{1
 fields={'numberofelements','numberofnodes','x','y','z','friction.coefficient','friction.p','friction.q',...
-        'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','constants.g','lowmem','nsteps','maxiter',...
+        'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','constants.g','settings.lowmem','nsteps','maxiter',...
         'eps_res','max_nonlinear_iterations','rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface','elementconnectivity'};
 checknan(md,fields);
@@ -90 +90 @@
 fields={'numberofelements','numberofnodes','elements','friction.coefficient','friction.p','friction.q',...
         'rho_ice','rho_water','rheology_B','elementoniceshelf','thickness','constants.g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter',...
-        'lowmem','rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface'};
+        'settings.lowmem','rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface'};
 checkgreater(md,fields,0);
 %}}}
@@ -169 +169 @@
         message('model not consistent: prognostic_DG should be a scalar (1 or 0)');
 end
-if ~ismember(md.lowmem,[0 1]),
-        message(['model not consistent: model ' md.name ' lowmem field should be 0 or 1']);
+if ~ismember(md.settings.lowmem,[0 1]),
+        message(['model not consistent: model ' md.name ' settings.lowmem field should be 0 or 1']);
 end
 if ~ismember(md.time_adapt,[0 1]),

issm/trunk/src/m/model/loadresultsfromdisk.m

@@ -19 +19 @@
 
         %load results onto model
-        structure=parseresultsfromdisk(filename,~md.io_gather);
+        structure=parseresultsfromdisk(filename,~md.settings.io_gather);
         md.results.(structure(1).SolutionType)=structure;