Changeset 9267
- Timestamp:
- 08/11/11 07:14:04 (14 years ago)
- Location:
- issm/trunk/src/m
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/m/classes/model.m
r9113 r9267 269 269 pressure = {NaN,true,'DoubleMat',1}; 270 270 %Hydrology 271 watercolumn = {NaN,true,'Double '};271 watercolumn = {NaN,true,'DoubleMat',1}; 272 272 hydro_n = {0,true,'Double'}; 273 273 hydro_CR = {0,true,'Double'}; -
issm/trunk/src/m/model/WriteData.m
r8987 r9267 22 22 %Now, write the data itself. 23 23 if strcmpi(data_type,'Boolean'),% {{{ 24 if(numel(data)~=1), error(['field ' field ' cannot be marshalled as it has more than one element!']); end 25 24 26 %first write length of record 25 27 fwrite(fid,1+4,'int'); %1 bool+code … … 32 34 % }}} 33 35 elseif strcmpi(data_type,'Integer'), % {{{ 36 if(numel(data)~=1), error(['field ' field ' cannot be marshalled as it has more than one element!']); end 37 34 38 %first write length of record 35 39 fwrite(fid,4+4,'int'); %1 integer + code … … 42 46 % }}} 43 47 elseif strcmpi(data_type,'Double'), % {{{ 48 if(numel(data)~=1), error(['field ' field ' cannot be marshalled as it has more than one element!']); end 49 44 50 %first write length of record 45 51 fwrite(fid,8+4,'int'); %1 double+code -
issm/trunk/src/m/model/ismodelselfconsistent.m
r9263 r9267 480 480 % {{{2 481 481 fields={'spcwatercolumn'}; 482 check size(md,fields,[md.numberofnodes 2]);482 checkforcing(md,fields); 483 483 fields={'watercolumn'}; 484 484 checksize(md,fields,[md.numberofnodes 1]); … … 726 726 if size(field,1)==md.numberofnodes, 727 727 if ~size(field,2)==1, 728 message(['model not consistent: model ' md.name ': ' field name' should have only one column as there are md.numberofnodes lines']);728 message(['model not consistent: model ' md.name ': ' fields{i} ' should have only one column as there are md.numberofnodes lines']); 729 729 end 730 730 elseif size(field,1)==md.numberofnodes+1 731 731 if any(field(end,:)~=sort(field(end,:))), 732 message(['model not consistent: model ' md.name ': ' field name' columns should be chronological']);732 message(['model not consistent: model ' md.name ': ' fields{i} ' columns should be chronological']); 733 733 end 734 734 if any(field(end,1:end-1)==field(end,2:end)), 735 message(['model not consistent: model ' md.name ': ' field name' columns must not contain duplicate timesteps']);735 message(['model not consistent: model ' md.name ': ' fields{i} ' columns must not contain duplicate timesteps']); 736 736 end 737 737 else 738 message(['model not consistent: model ' md.name ': ' field name' should have md.numberofnodes or md.numberofnodes+1 lines']);738 message(['model not consistent: model ' md.name ': ' fields{i} ' should have md.numberofnodes or md.numberofnodes+1 lines']); 739 739 end 740 740 end
Note:
See TracChangeset
for help on using the changeset viewer.