![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 26532
- Timestamp:
- 11/04/21 07:40:42 (3 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 7 edited
-
src/m/classes/stochasticforcing.m (modified) (4 diffs)
-
test/Archives/Archive257.arch (modified) ( previous)
-
test/Archives/Archive542.arch (modified) ( previous)
-
test/Archives/Archive543.arch (modified) ( previous)
-
test/NightlyRun/test257.m (modified) (1 diff)
-
test/NightlyRun/test542.m (modified) (1 diff)
-
test/NightlyRun/test543.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/stochasticforcing.m
r26526 r26532 64 64 fielddisplay(self,'randomflag','whether to apply real randomness (true) or pseudo-randomness with fixed seed (false)'); 65 65 disp('Available fields:'); 66 disp(' SMBautoregression'); 67 disp(' FrontalForcingsRignotAutoregression (thermal forcing)'); 66 for field=supportedstochforcings() 67 fprintf(' %s \n',string(field)); 68 end 68 69 end % }}} 69 70 function marshall(self,prefix,md,fid) % {{{ … … 71 72 yts=md.constants.yts; 72 73 num_fields = numel(self.fields); 73 %Scaling covariance matrix (scale column-by-column and row-by-row)74 scaledfields = {'SMBautoregression'}; %list of fields that need scaling *1/yts75 for i=1:num_fields76 if any(strcmp(scaledfields,self.fields(i)))77 inds = [1+sum(self.dimensions(1:i-1)):1:sum(self.dimensions(1:i))];78 for row=inds %scale rows corresponding to scaled field79 self.covariance(row,:) = 1./yts*self.covariance(row,:);80 end81 for col=inds %scale columns corresponding to scaled field82 self.covariance(:,col) = 1./yts*self.covariance(:,col);83 end84 end85 end86 74 87 75 WriteData(fid,prefix,'object',self,'fieldname','isstochasticforcing','format','Boolean'); … … 89 77 return 90 78 else 79 %Scaling covariance matrix (scale column-by-column and row-by-row) 80 scaledfields = {'SMBautoregression'}; %list of fields that need scaling *1/yts 81 tempcovariance = self.covariance; %copy of covariance to avoid writing back in member variable 82 for i=1:num_fields 83 if any(strcmp(scaledfields,self.fields(i))) 84 inds = [1+sum(self.dimensions(1:i-1)):1:sum(self.dimensions(1:i))]; 85 for row=inds %scale rows corresponding to scaled field 86 tempcovariance(row,:) = 1./yts*self.covariance(row,:); 87 end 88 for col=inds %scale columns corresponding to scaled field 89 tempcovariance(:,col) = 1./yts*self.covariance(:,col); 90 end 91 end 92 end 91 93 WriteData(fid,prefix,'data',num_fields,'name','md.stochasticforcing.num_fields','format','Integer'); 92 94 WriteData(fid,prefix,'object',self,'fieldname','fields','format','StringArray'); 93 95 WriteData(fid,prefix,'object',self,'fieldname','dimensions','format','IntMat'); 94 WriteData(fid,prefix,' object',self,'fieldname','covariance','format','DoubleMat');96 WriteData(fid,prefix,'data',tempcovariance,'name','md.stochasticforcing.covariance','format','DoubleMat'); 95 97 WriteData(fid,prefix,'object',self,'fieldname','randomflag','format','Boolean'); 96 98 end … … 98 100 end 99 101 end 102 function list = supportedstochforcings() % {{{ 103 % Defines list of fields supported 104 % by the class md.stochasticforcing 105 106 list = {... 107 'SMBautoregression',... 108 'FrontalForcingsRignotAutoregression' 109 }; 110 end % }}} -
issm/trunk-jpl/test/NightlyRun/test257.m
r26526 r26532 64 64 (md.results.TransientSolution(1).Vy),... 65 65 (md.results.TransientSolution(1).Vel),... 66 (md.results.TransientSolution(1).Pressure),...67 (md.results.TransientSolution(1).Base),...68 (md.results.TransientSolution(1).Surface),...69 66 (md.results.TransientSolution(1).Thickness),... 70 67 (md.results.TransientSolution(1).IceVolume),... 71 68 (md.results.TransientSolution(1).SmbMassBalance),... 72 69 (md.results.TransientSolution(2).Vx),... 73 70 (md.results.TransientSolution(2).Vy),... 74 71 (md.results.TransientSolution(2).Vel),... 75 (md.results.TransientSolution(2).Pressure),...76 (md.results.TransientSolution(2).Base),...77 (md.results.TransientSolution(2).Surface),...78 72 (md.results.TransientSolution(2).Thickness),... 79 73 (md.results.TransientSolution(2).IceVolume),... 80 74 (md.results.TransientSolution(2).SmbMassBalance),... 81 75 (md.results.TransientSolution(3).Vx),... 82 76 (md.results.TransientSolution(3).Vy),... 83 77 (md.results.TransientSolution(3).Vel),... 84 (md.results.TransientSolution(3).Pressure),...85 (md.results.TransientSolution(3).Base),...86 (md.results.TransientSolution(3).Surface),...87 78 (md.results.TransientSolution(3).Thickness),... 88 79 (md.results.TransientSolution(3).IceVolume),... 89 80 (md.results.TransientSolution(3).SmbMassBalance),... 90 81 }; -
issm/trunk-jpl/test/NightlyRun/test542.m
r26495 r26532 61 61 (md.results.TransientSolution(1).Surface),... 62 62 (md.results.TransientSolution(1).Thickness),... 63 (md.results.TransientSolution(1).MaskIceLevelset),... 63 64 (md.results.TransientSolution(1).CalvingMeltingrate),... 64 (md.results.TransientSolution(1).MaskIceLevelset),...65 65 (md.results.TransientSolution(2).Vx),... 66 66 (md.results.TransientSolution(2).Vy),... -
issm/trunk-jpl/test/NightlyRun/test543.m
r26526 r26532 70 70 (md.results.TransientSolution(1).Surface),... 71 71 (md.results.TransientSolution(1).Thickness),... 72 (md.results.TransientSolution(1).MaskIceLevelset),... 72 73 (md.results.TransientSolution(1).CalvingMeltingrate),... 73 (md.results.TransientSolution(1).MaskIceLevelset),...74 74 (md.results.TransientSolution(2).Vx),... 75 75 (md.results.TransientSolution(2).Vy),...
Note:
See TracChangeset
for help on using the changeset viewer.
