Changeset 17053

Timestamp:

12/23/13 13:42:09 (11 years ago)

Author:

Eric.Larour

Message:

CHG: makes weights a transient input.

File:

• issm/trunk-jpl/src/m/classes/misfit.m (modified) (3 diffs)

issm/trunk-jpl/src/m/classes/misfit.m

@@ -18 +18 @@
                 name              = '';
                 model_enum        = NaN; %enum for field that is modeled
-                observation      = NaN; %observed field that we compare the model against
-                observation_enum = NaN; %enum for observed field.
+                observation       = NaN; %observed field that we compare the model against
+                observation_enum  = NaN; %enum for observed field.
                 timeinterpolation = '';
                 weights           = NaN; %weight coefficients for every vertex
                 weights_enum      = NaN; %enum to identify this particular set of weights
+                cumulated         = NaN; %do we cumulate misfit through time?
         end
         
@@ -58 +59 @@
                         md = checkfield(md,'fieldname','obj.observation','field',obj.observation,'forcing',1,'NaN',1);
                         md = checkfield(md,'fieldname','obj.timeinterpolation','field',obj.timeinterpolation,'values',{'nearestneighbor'});
-                        md = checkfield(md,'fieldname','obj.weights','field',obj.weights,'size',[md.mesh.numberofvertices 1],'>=',0,'<=',1);
+                        md = checkfield(md,'fieldname','obj.weights','field',obj.weights,'forcing',1,'NaN',1);
 
                 end % }}}
@@ -81 +82 @@
                 WriteData(fid,'object',obj,'fieldname','observation_enum','format','Integer');
                 WriteData(fid,'object',obj,'fieldname','timeinterpolation','format','String');
-                WriteData(fid,'object',obj,'fieldname','weights','format','DoubleMat','mattype',1);
+                WriteData(fid,'object',obj,'fieldname','weights','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
                 WriteData(fid,'object',obj,'fieldname','weights_enum','format','Integer');