Changeset 21049 for issm/trunk-jpl/src/m/classes/taoinversion.m

Timestamp:

08/02/16 17:06:46 (9 years ago)

Author:

agscott1

Message:

CHG: Replaced Enums with Strings in matlab and python. Updated corresponding cpp code.

File:

• issm/trunk-jpl/src/m/classes/taoinversion.m (modified) (2 diffs)

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

@@ -117 +117 @@
                         md = checkfield(md,'fieldname','inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
 
-                        if solution==BalancethicknessSolutionEnum()
+                        if strcmp(solution,'BalancethicknessSolution')
                                 md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1,'Inf',1);
-                        elseif solution==BalancethicknessSoftSolutionEnum()
+                        elseif strcmp(solution,'BalancethicknessSoftSolution')
                                 md = checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1,'Inf',1);
                         else
@@ -192 +192 @@
                         num_cost_functions=size(self.cost_functions,2);
                         data=marshallcostfunctions(self.cost_functions);
-                        WriteData(fid,prefix,'data',data,'name','md.inversion.cost_functions','format','DoubleMat','mattype',3);
+                        WriteData(fid,prefix,'data',data,'name','md.inversion.cost_functions','format','StringArray');
                         WriteData(fid,prefix,'data',num_cost_functions,'name','md.inversion.num_cost_functions','format','Integer');
                 end % }}}