Changeset 9622


Ignore:
Timestamp:
09/06/11 14:12:11 (14 years ago)
Author:
seroussi
Message:

added settings object

Location:
issm/trunk/src
Files:
3 added
2 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/Container/Elements.cpp

    r9320 r9622  
    175175
    176176        /*Recover parameters: */
    177         parameters->FindParam(&io_gather,IoGatherEnum);
     177        parameters->FindParam(&io_gather,SettingsIoGatherEnum);
    178178
    179179        /*create patch object out of all results in this dataset: */
  • issm/trunk/src/c/Container/Results.cpp

    r9320 r9622  
    162162        /*Recover file descriptor: */
    163163        parameters->FindParam(&fid,OutputFilePointerEnum);
    164         parameters->FindParam(&io_gather,IoGatherEnum);
     164        parameters->FindParam(&io_gather,SettingsIoGatherEnum);
    165165
    166166        for(i=0;i<this->Size();i++){
  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r9619 r9622  
    3232        HydrologyQEnum,
    3333        HydrologyCREnum,
     34        SettingsLowmemEnum,
     35        SettingsIoGatherEnum,
    3436        /*}}}*/
    3537        /*Datasets {{{1*/
     
    289291        WaterColumnOldEnum,
    290292        /*}}}*/
    291         /*Io{{{1*/
    292         IoGatherEnum,
    293         /*}}}*/
    294293        /*Responses{{{1*/
    295294        MinVelEnum,
     
    347346        EpsRelEnum,
    348347        EpsResEnum,
    349         LowmemEnum,
    350348        MaxNonlinearIterationsEnum,
    351349        MinMechanicalConstraintsEnum,
  • issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

    r9619 r9622  
    3636                case HydrologyQEnum : return "HydrologyQ";
    3737                case HydrologyCREnum : return "HydrologyCR";
     38                case SettingsLowmemEnum : return "SettingsLowmem";
     39                case SettingsIoGatherEnum : return "SettingsIoGather";
    3840                case ConstraintsEnum : return "Constraints";
    3941                case ElementsEnum : return "Elements";
     
    251253                case OutputFrequencyEnum : return "OutputFrequency";
    252254                case WaterColumnOldEnum : return "WaterColumnOld";
    253                 case IoGatherEnum : return "IoGather";
    254255                case MinVelEnum : return "MinVel";
    255256                case MaxVelEnum : return "MaxVel";
     
    296297                case EpsRelEnum : return "EpsRel";
    297298                case EpsResEnum : return "EpsRes";
    298                 case LowmemEnum : return "Lowmem";
    299299                case MaxNonlinearIterationsEnum : return "MaxNonlinearIterations";
    300300                case MinMechanicalConstraintsEnum : return "MinMechanicalConstraints";
  • issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

    r9597 r9622  
    4242        parameters->AddObject(iomodel->CopyConstantObject(HydrostaticAdjustmentEnum));
    4343        parameters->AddObject(iomodel->CopyConstantObject(PenaltyOffsetEnum));
    44         parameters->AddObject(iomodel->CopyConstantObject(LowmemEnum));
     44        parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum));
    4545        parameters->AddObject(iomodel->CopyConstantObject(ConnectivityEnum));
    4646        parameters->AddObject(iomodel->CopyConstantObject(BetaEnum));
     
    5959        parameters->AddObject(iomodel->CopyConstantObject(WaitonlockEnum));
    6060        parameters->AddObject(iomodel->CopyConstantObject(NumberOfElementsEnum));
    61         parameters->AddObject(iomodel->CopyConstantObject(IoGatherEnum));
     61        parameters->AddObject(iomodel->CopyConstantObject(SettingsIoGatherEnum));
    6262        parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMigrationEnum));
    6363        parameters->AddObject(iomodel->CopyConstantObject(IsdiagnosticEnum));
  • issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

    r9586 r9622  
    7272
    7373                /*What strategy? : */
    74                 parameters->FindParam(&io_gather,IoGatherEnum);
     74                parameters->FindParam(&io_gather,SettingsIoGatherEnum);
    7575
    7676                if(io_gather){
  • issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r9619 r9622  
    3434        else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum;
    3535        else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum;
     36        else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
     37        else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
    3638        else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
    3739        else if (strcmp(name,"Elements")==0) return ElementsEnum;
     
    249251        else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum;
    250252        else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
    251         else if (strcmp(name,"IoGather")==0) return IoGatherEnum;
    252253        else if (strcmp(name,"MinVel")==0) return MinVelEnum;
    253254        else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
     
    294295        else if (strcmp(name,"EpsRel")==0) return EpsRelEnum;
    295296        else if (strcmp(name,"EpsRes")==0) return EpsResEnum;
    296         else if (strcmp(name,"Lowmem")==0) return LowmemEnum;
    297297        else if (strcmp(name,"MaxNonlinearIterations")==0) return MaxNonlinearIterationsEnum;
    298298        else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum;
  • issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

    r9225 r9622  
    3838        /*Recover parameters: */
    3939        kflag=1; pflag=1;
    40         femmodel->parameters->FindParam(&lowmem,LowmemEnum);
     40        femmodel->parameters->FindParam(&lowmem,SettingsLowmemEnum);
    4141        femmodel->parameters->FindParam(&min_thermal_constraints,MinThermalConstraintsEnum);
    4242        femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
  • issm/trunk/src/m/classes/clusters/generic.m

    r9614 r9622  
    100100                         end
    101101
    102                          if ~md.io_gather,
     102                         if ~md.settings.io_gather,
    103103                                 %concatenate the output files:
    104104                                 fprintf(fid,'\ncat %s.outbin.* > %s.outbin',modelname,modelname);
  • issm/trunk/src/m/classes/clusters/pfe.m

    r9614 r9622  
    140140                         fprintf(fid,'mpiexec -verbose -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution_type),modelname);
    141141
    142                          if ~md.io_gather,
     142                         if ~md.settings.io_gather,
    143143                                 %concatenate the output files:
    144144                                 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
     
    157157                                 end
    158158
    159                                  if ~md.io_gather,
     159                                 if ~md.settings.io_gather,
    160160                                         %concatenate the output files:
    161161                                         fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
  • issm/trunk/src/m/classes/model/model.m

    r9620 r9622  
    2121                 rifts     = modelfield('default',0,'marshall',true);
    2222                 hydrology = modelfield('default',0,'marshall',true);
     23                 settings  = modelfield('default',0,'marshall',true);
    2324                 radaroverlay = modelfield('default',0,'marshall',false);
    2425
     
    4344                 edges               = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
    4445
    45                  %I/O
    46                  io_gather           = modelfield('default',0,'marshall',true,'format','Boolean');
    47 
    4846                 %Initial 2d mesh
    4947                 numberofelements2d = modelfield('default',0,'marshall',true,'format','Integer');
     
    162160                 max_steadystate_iterations = modelfield('default',0,'marshall',true,'format','Integer');
    163161                 connectivity             = modelfield('default',0,'marshall',true,'format','Integer');
    164                  lowmem                   = modelfield('default',0,'marshall',true,'format','Boolean');
    165162                 viscosity_overshoot      = modelfield('default',0,'marshall',true,'format','Double');
    166163
     
    537534                         md.rifts=rifts;
    538535                         md.hydrology=hydrology;
     536                         md.settings=settings;
    539537                         md.radaroverlay=radaroverlay;
    540538
     
    597595                         md.connectivity=25;
    598596
    599                          %lowmem??
    600                          md.lowmem=0;
    601 
    602597                         %coefficient to update the viscosity between each iteration of
    603598                         %a diagnostic according to the following formula
     
    719714                         md.rheology_law='Paterson';
    720715
    721                          %i/o:
    722                          md.io_gather=1;
    723716                 end
    724717                 %}}}
  • issm/trunk/src/m/model/ismodelselfconsistent.m

    r9619 r9622  
    8383%NO NAN {{{1
    8484fields={'numberofelements','numberofnodes','x','y','z','friction.coefficient','friction.p','friction.q',...
    85         'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','constants.g','lowmem','nsteps','maxiter',...
     85        'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','constants.g','settings.lowmem','nsteps','maxiter',...
    8686        'eps_res','max_nonlinear_iterations','rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface','elementconnectivity'};
    8787checknan(md,fields);
     
    9090fields={'numberofelements','numberofnodes','elements','friction.coefficient','friction.p','friction.q',...
    9191        'rho_ice','rho_water','rheology_B','elementoniceshelf','thickness','constants.g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter',...
    92         'lowmem','rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface'};
     92        'settings.lowmem','rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface'};
    9393checkgreater(md,fields,0);
    9494%}}}
     
    169169        message('model not consistent: prognostic_DG should be a scalar (1 or 0)');
    170170end
    171 if ~ismember(md.lowmem,[0 1]),
    172         message(['model not consistent: model ' md.name ' lowmem field should be 0 or 1']);
     171if ~ismember(md.settings.lowmem,[0 1]),
     172        message(['model not consistent: model ' md.name ' settings.lowmem field should be 0 or 1']);
    173173end
    174174if ~ismember(md.time_adapt,[0 1]),
  • issm/trunk/src/m/model/loadresultsfromdisk.m

    r9614 r9622  
    1919
    2020        %load results onto model
    21         structure=parseresultsfromdisk(filename,~md.io_gather);
     21        structure=parseresultsfromdisk(filename,~md.settings.io_gather);
    2222        md.results.(structure(1).SolutionType)=structure;
    2323
Note: See TracChangeset for help on using the changeset viewer.