Changeset 15860

Timestamp:

08/21/13 14:39:40 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added check so that inversions are only performed on SSA HO and FS models

Location:

issm/trunk-jpl/src/m/classes

Files:

• inversion.m (modified) (1 diff)
• inversion.py (modified) (1 diff)

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

@@ -127 +127 @@
                         md = checkfield(md,'inversion.max_parameters','size',[md.mesh.numberofvertices num_controls]);
 
+                        %Only SSA, HO and FS are supported right now
+                        if solution==StressbalanceSolutionEnum()
+                                if ~(md.flowequation.isSSA || md.flowequation.isHO || md.flowequation.isFS),
+                                        md = checkmessage(md,['inversion can only be performed for SSA, HO or FS ice flow models']);
+                                end
+                        end
+
                         if solution==BalancethicknessSolutionEnum()
                                 md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1);

issm/trunk-jpl/src/m/classes/inversion.py

@@ -135 +135 @@
                 md = checkfield(md,'inversion.max_parameters','size',[md.mesh.numberofvertices,num_controls])
 
+                #Only SSA, HO and FS are supported right now
+                if solution==StressbalanceSolutionEnum():
+                        if not (md.flowequation.isSSA or md.flowequation.isHO or md.flowequation.isFS):
+                                md.checkmessage("'inversion can only be performed for SSA, HO or FS ice flow models");
+
                 if solution==BalancethicknessSolutionEnum():
                         md = checkfield(md,'inversion.thickness_obs','size',[md.mesh.numberofvertices],'NaN',1)