Changeset 9629
- Timestamp:
- 09/06/11 15:55:32 (14 years ago)
- Location:
- issm/trunk
- Files:
-
- 1 added
- 1 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/m/classes/model/model.m
r9628 r9629 25 25 miscellaneous = modelfield('default',0,'marshall',true); 26 26 timestepping = modelfield('default',0,'marshall',true); 27 groundingline = modelfield('default',0,'marshall',true); 27 28 28 29 %FIXME: all other fields should belong to other classes … … 193 194 temperature = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); %temperature solution vector 194 195 waterfraction = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); 195 groundingline_melting_rate = modelfield('default',NaN,'marshall',true,'format','Double');196 196 pressure = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); 197 197 %Hydrology … … 226 226 ad_forward = modelfield('default',true,'marshall',true,'format','Boolean'); 227 227 ad_reverse = modelfield('default',false,'marshall',true,'format','Boolean'); 228 229 %grounding line migration:230 groundingline_migration = modelfield('default','','marshall',true,'preprocess','StringToEnum','format','Integer');231 228 232 229 %partitioner: … … 468 465 end 469 466 if isnumeric(structmd.groundingline_migration), 470 if (structmd.groundingline_migration==272), md.groundingline _migration='None'; end471 if (structmd.groundingline_migration==273), md.groundingline _migration='AgressiveMigration'; end472 if (structmd.groundingline_migration==274), md.groundingline _migration='SoftMigration'; end467 if (structmd.groundingline_migration==272), md.groundingline.migration='None'; end 468 if (structmd.groundingline_migration==273), md.groundingline.migration='AgressiveMigration'; end 469 if (structmd.groundingline_migration==274), md.groundingline.migration='SoftMigration'; end 473 470 end 474 471 if isnumeric(md.control_type), … … 538 535 md.miscellaneous=miscellaneous; 539 536 md.timestepping=timestepping; 537 md.groundingline=groundingline; 540 538 541 539 %Materials parameters … … 552 550 %ice latent heat of fusion L (J/kg) 553 551 md.latentheat=3.34*10^5; 554 555 %basal melting rate correction:556 md.groundingline_melting_rate=0;557 552 558 553 %ice thermal conductivity lamda (W/m/K) … … 683 678 %NaN if not applied 684 679 md.eps_cm=NaN; %not activated 685 686 %grounding line migration:687 md.groundingline_migration='None';688 680 689 681 %How often to save results, default is 1 so save every step -
issm/trunk/src/m/model/ismodelselfconsistent.m
r9628 r9629 120 120 end 121 121 %GROUNDING LINE MIGRATION {{{1 122 if ~ismember({md.groundingline _migration},{'None' 'AgressiveMigration' 'SoftMigration'}),123 message(['model not consistent: model ' md.miscellaneous.name ' groundingline _migration field should be ''None'' ''AgressiveMigration'' or ''SoftMigration''']);124 end 125 if ~strcmp(md.groundingline _migration,'None'),122 if ~ismember({md.groundingline.migration},{'None' 'AgressiveMigration' 'SoftMigration'}), 123 message(['model not consistent: model ' md.miscellaneous.name ' groundingline.migration field should be ''None'' ''AgressiveMigration'' or ''SoftMigration''']); 124 end 125 if ~strcmp(md.groundingline.migration,'None'), 126 126 if (md.dim==3 | strcmpi(md.cluster.name,'none')), 127 127 message(['model ' md.miscellaneous.name ' requesting grounding line migration, but grounding line module only implemented for 2d models and parallel runs!']); -
issm/trunk/src/m/model/tres.m
r9619 r9629 67 67 results2(count).time=md.results.TransientSolution(i).time; 68 68 results2(count).step=md.results.TransientSolution(i).step; 69 if ~strcmpi(md.groundingline _migration,'None'),69 if ~strcmpi(md.groundingline.migration,'None'), 70 70 results2(count).ElementOnIceShelf=md.results.TransientSolution(i).ElementOnIceShelf; 71 71 end -
issm/trunk/template
r9628 r9629 163 163 isgroundingline -> add 164 164 requested_outputs 165 }}}166 goundingline {{{167 groundingline_migration -> rename migration_type168 groundingline_melting_rate -> rename melting_rate169 165 }}} 170 166 inversion{{{ -
issm/trunk/test/NightlyRun/test446.m
r9516 r9629 43 43 %test different grounding line dynamics. 44 44 %grounding line: 45 md.groundingline _migration='AgressiveMigration';45 md.groundingline.migration='AgressiveMigration'; 46 46 md=solve(md,GroundinglineMigration2DSolutionEnum); 47 47 element_on_iceshelf_agressive=PatchToVec(md.results.GroundinglineMigration2DSolution.ElementOnIceShelf); 48 48 49 md.groundingline _migration='SoftMigration';49 md.groundingline.migration='SoftMigration'; 50 50 md=solve(md,GroundinglineMigration2DSolutionEnum); 51 51 element_on_iceshelf_soft=PatchToVec(md.results.GroundinglineMigration2DSolution.ElementOnIceShelf); -
issm/trunk/test/Par/RoundSheetShelf.par
r9628 r9629 68 68 69 69 %bathymetry and grounding line migration: 70 md.groundingline _migration='AgressiveMigration';70 md.groundingline.migration='AgressiveMigration'; 71 71 md.bathymetry=md.bed; 72 72 pos=find(md.nodeoniceshelf); md.bathymetry(pos)=md.bed(pos)-900;
Note:
See TracChangeset
for help on using the changeset viewer.