Changeset 9542 for issm/trunk/src/m/classes/model.m

Timestamp:

08/31/11 17:36:09 (14 years ago)

Author:

Mathieu Morlighem

Message:

renumbering of cm_responses

File:

• issm/trunk/src/m/classes/model.m (modified) (3 diffs)

issm/trunk/src/m/classes/model.m

@@ -184 +184 @@
                  nsteps           = modelfield('default',0,'marshall',true,'format','Integer');
                  maxiter          = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
-                 cm_responses     = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
+                 cm_responses     = modelfield('default',NaN,'marshall',true,'preprocess','marshallcmresponses','format','DoubleMat','mattype',3);
                  tolx             = modelfield('default',0,'marshall',true,'format','Double');
                  optscal          = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3);
@@ -499 +499 @@
                                  if (structmd.control_type==147), md.control_type={'Dhdt'}; end
                          end
+                         if ismember(structmd.cm_responses(end,end),[165:170 383 388 389]),
+                                 pos=find(structmd.cm_responses==166), md.control_type(pos)=101;
+                                 pos=find(structmd.cm_responses==167), md.control_type(pos)=102;
+                                 pos=find(structmd.cm_responses==168), md.control_type(pos)=103;
+                                 pos=find(structmd.cm_responses==169), md.control_type(pos)=104;
+                                 pos=find(structmd.cm_responses==170), md.control_type(pos)=105;
+                                 pos=find(structmd.cm_responses==165), md.control_type(pos)=201;
+                                 pos=find(structmd.cm_responses==389), md.control_type(pos)=501;
+                                 pos=find(structmd.cm_responses==388), md.control_type(pos)=502;
+                                 pos=find(structmd.cm_responses==382), md.control_type(pos)=503;
+                         end
 
                          %New fields
@@ -688 +699 @@
 
                          %several responses can be used:
-                         md.cm_responses=SurfaceAbsVelMisfitEnum*ones(md.nsteps,1);
+                         md.cm_responses=101*ones(md.nsteps,1);
 
                          %cm_jump is used to speed up control method. When