Changeset 9622
- Timestamp:
- 09/06/11 14:12:11 (14 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 3 added
- 2 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Container/Elements.cpp
r9320 r9622 175 175 176 176 /*Recover parameters: */ 177 parameters->FindParam(&io_gather, IoGatherEnum);177 parameters->FindParam(&io_gather,SettingsIoGatherEnum); 178 178 179 179 /*create patch object out of all results in this dataset: */ -
issm/trunk/src/c/Container/Results.cpp
r9320 r9622 162 162 /*Recover file descriptor: */ 163 163 parameters->FindParam(&fid,OutputFilePointerEnum); 164 parameters->FindParam(&io_gather, IoGatherEnum);164 parameters->FindParam(&io_gather,SettingsIoGatherEnum); 165 165 166 166 for(i=0;i<this->Size();i++){ -
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r9619 r9622 32 32 HydrologyQEnum, 33 33 HydrologyCREnum, 34 SettingsLowmemEnum, 35 SettingsIoGatherEnum, 34 36 /*}}}*/ 35 37 /*Datasets {{{1*/ … … 289 291 WaterColumnOldEnum, 290 292 /*}}}*/ 291 /*Io{{{1*/292 IoGatherEnum,293 /*}}}*/294 293 /*Responses{{{1*/ 295 294 MinVelEnum, … … 347 346 EpsRelEnum, 348 347 EpsResEnum, 349 LowmemEnum,350 348 MaxNonlinearIterationsEnum, 351 349 MinMechanicalConstraintsEnum, -
issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp
r9619 r9622 36 36 case HydrologyQEnum : return "HydrologyQ"; 37 37 case HydrologyCREnum : return "HydrologyCR"; 38 case SettingsLowmemEnum : return "SettingsLowmem"; 39 case SettingsIoGatherEnum : return "SettingsIoGather"; 38 40 case ConstraintsEnum : return "Constraints"; 39 41 case ElementsEnum : return "Elements"; … … 251 253 case OutputFrequencyEnum : return "OutputFrequency"; 252 254 case WaterColumnOldEnum : return "WaterColumnOld"; 253 case IoGatherEnum : return "IoGather";254 255 case MinVelEnum : return "MinVel"; 255 256 case MaxVelEnum : return "MaxVel"; … … 296 297 case EpsRelEnum : return "EpsRel"; 297 298 case EpsResEnum : return "EpsRes"; 298 case LowmemEnum : return "Lowmem";299 299 case MaxNonlinearIterationsEnum : return "MaxNonlinearIterations"; 300 300 case MinMechanicalConstraintsEnum : return "MinMechanicalConstraints"; -
issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp
r9597 r9622 42 42 parameters->AddObject(iomodel->CopyConstantObject(HydrostaticAdjustmentEnum)); 43 43 parameters->AddObject(iomodel->CopyConstantObject(PenaltyOffsetEnum)); 44 parameters->AddObject(iomodel->CopyConstantObject( LowmemEnum));44 parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum)); 45 45 parameters->AddObject(iomodel->CopyConstantObject(ConnectivityEnum)); 46 46 parameters->AddObject(iomodel->CopyConstantObject(BetaEnum)); … … 59 59 parameters->AddObject(iomodel->CopyConstantObject(WaitonlockEnum)); 60 60 parameters->AddObject(iomodel->CopyConstantObject(NumberOfElementsEnum)); 61 parameters->AddObject(iomodel->CopyConstantObject( IoGatherEnum));61 parameters->AddObject(iomodel->CopyConstantObject(SettingsIoGatherEnum)); 62 62 parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMigrationEnum)); 63 63 parameters->AddObject(iomodel->CopyConstantObject(IsdiagnosticEnum)); -
issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp
r9586 r9622 72 72 73 73 /*What strategy? : */ 74 parameters->FindParam(&io_gather, IoGatherEnum);74 parameters->FindParam(&io_gather,SettingsIoGatherEnum); 75 75 76 76 if(io_gather){ -
issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp
r9619 r9622 34 34 else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum; 35 35 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; 36 38 else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; 37 39 else if (strcmp(name,"Elements")==0) return ElementsEnum; … … 249 251 else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum; 250 252 else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; 251 else if (strcmp(name,"IoGather")==0) return IoGatherEnum;252 253 else if (strcmp(name,"MinVel")==0) return MinVelEnum; 253 254 else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; … … 294 295 else if (strcmp(name,"EpsRel")==0) return EpsRelEnum; 295 296 else if (strcmp(name,"EpsRes")==0) return EpsResEnum; 296 else if (strcmp(name,"Lowmem")==0) return LowmemEnum;297 297 else if (strcmp(name,"MaxNonlinearIterations")==0) return MaxNonlinearIterationsEnum; 298 298 else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum; -
issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp
r9225 r9622 38 38 /*Recover parameters: */ 39 39 kflag=1; pflag=1; 40 femmodel->parameters->FindParam(&lowmem, LowmemEnum);40 femmodel->parameters->FindParam(&lowmem,SettingsLowmemEnum); 41 41 femmodel->parameters->FindParam(&min_thermal_constraints,MinThermalConstraintsEnum); 42 42 femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); -
issm/trunk/src/m/classes/clusters/generic.m
r9614 r9622 100 100 end 101 101 102 if ~md. io_gather,102 if ~md.settings.io_gather, 103 103 %concatenate the output files: 104 104 fprintf(fid,'\ncat %s.outbin.* > %s.outbin',modelname,modelname); -
issm/trunk/src/m/classes/clusters/pfe.m
r9614 r9622 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); 141 141 142 if ~md. io_gather,142 if ~md.settings.io_gather, 143 143 %concatenate the output files: 144 144 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); … … 157 157 end 158 158 159 if ~md. io_gather,159 if ~md.settings.io_gather, 160 160 %concatenate the output files: 161 161 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); -
issm/trunk/src/m/classes/model/model.m
r9620 r9622 21 21 rifts = modelfield('default',0,'marshall',true); 22 22 hydrology = modelfield('default',0,'marshall',true); 23 settings = modelfield('default',0,'marshall',true); 23 24 radaroverlay = modelfield('default',0,'marshall',false); 24 25 … … 43 44 edges = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); 44 45 45 %I/O46 io_gather = modelfield('default',0,'marshall',true,'format','Boolean');47 48 46 %Initial 2d mesh 49 47 numberofelements2d = modelfield('default',0,'marshall',true,'format','Integer'); … … 162 160 max_steadystate_iterations = modelfield('default',0,'marshall',true,'format','Integer'); 163 161 connectivity = modelfield('default',0,'marshall',true,'format','Integer'); 164 lowmem = modelfield('default',0,'marshall',true,'format','Boolean');165 162 viscosity_overshoot = modelfield('default',0,'marshall',true,'format','Double'); 166 163 … … 537 534 md.rifts=rifts; 538 535 md.hydrology=hydrology; 536 md.settings=settings; 539 537 md.radaroverlay=radaroverlay; 540 538 … … 597 595 md.connectivity=25; 598 596 599 %lowmem??600 md.lowmem=0;601 602 597 %coefficient to update the viscosity between each iteration of 603 598 %a diagnostic according to the following formula … … 719 714 md.rheology_law='Paterson'; 720 715 721 %i/o:722 md.io_gather=1;723 716 end 724 717 %}}} -
issm/trunk/src/m/model/ismodelselfconsistent.m
r9619 r9622 83 83 %NO NAN {{{1 84 84 fields={'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',... 86 86 'eps_res','max_nonlinear_iterations','rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface','elementconnectivity'}; 87 87 checknan(md,fields); … … 90 90 fields={'numberofelements','numberofnodes','elements','friction.coefficient','friction.p','friction.q',... 91 91 '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'}; 93 93 checkgreater(md,fields,0); 94 94 %}}} … … 169 169 message('model not consistent: prognostic_DG should be a scalar (1 or 0)'); 170 170 end 171 if ~ismember(md. lowmem,[0 1]),172 message(['model not consistent: model ' md.name ' lowmem field should be 0 or 1']);171 if ~ismember(md.settings.lowmem,[0 1]), 172 message(['model not consistent: model ' md.name ' settings.lowmem field should be 0 or 1']); 173 173 end 174 174 if ~ismember(md.time_adapt,[0 1]), -
issm/trunk/src/m/model/loadresultsfromdisk.m
r9614 r9622 19 19 20 20 %load results onto model 21 structure=parseresultsfromdisk(filename,~md. io_gather);21 structure=parseresultsfromdisk(filename,~md.settings.io_gather); 22 22 md.results.(structure(1).SolutionType)=structure; 23 23
Note:
See TracChangeset
for help on using the changeset viewer.