Changeset 8369
- Timestamp:
- 05/20/11 07:33:26 (14 years ago)
- Location:
- issm/trunk/src/m/model
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/m/model/extrude.m
r8318 r8369 153 153 md.dhdt=project3d(md,md.dhdt,'node'); 154 154 md.firn_layer=project3d(md,md.firn_layer,'node',md.numlayers); 155 if ~isnan(md.forcing_accumulation), md.forcing_accumulation=[project3d(md,md.forcing_accumulation(1:end-1,:),'node');md.forcing_accumulation(end,:)]; end 155 if ~isempty(md.forcings), 156 forcingnames=fieldnames(md.forcings); 157 numforcings=length(md.forcings); 158 for i=1:numforcings 159 forcing=md.forcings.(forcingnames{i}); 160 md.forcings.(forcingnames{i})=[project3d(md,forcing(1:end-1,:),'node');forcing(end,:)]; 161 end 162 end 156 163 157 164 %results -
issm/trunk/src/m/model/marshall.m
r8365 r8369 95 95 96 96 %deal with forcings 97 if ~is nans(md.forcings),97 if ~isempty(md.forcings), 98 98 forcingnames=fieldnames(md.forcings); 99 99 numforcings=length(forcingnames); 100 100 forcingtypes=zeros(numforcings,1); 101 101 for i=1:numforcings, 102 forcingtypes(i)=StringToEnum(forcingnames{i}); 102 switch (forcingnames{i}) 103 case 'accumulation_rate' 104 forcingtypes(i)=AccumulationRateEnum; 105 case 'melting_rate' 106 forcingtypes(i)=MeltingRateEnum; 107 otherwise 108 error(['forcing ' forcingnames{i} ' not supported yet']); 109 end 103 110 end 104 111 WriteData(fid,numforcings,'Integer','numforcings');
Note:
See TracChangeset
for help on using the changeset viewer.