Changeset 9882

Timestamp:

09/22/11 10:17:56 (14 years ago)

Author:

jschierm

Message:

Flaim: fix mesh parameters, consistency checking, and flaim.m shadowing for model subclass implementation.

Location:

issm/trunk/src/m

Files:

• model/solve.m (modified) (2 diffs)
• solutions/flaim_sol.m (moved) (moved from issm/trunk/src/m/solutions/flaim.m ) (3 diffs)

issm/trunk/src/m/model/solve.m

@@ -36 +36 @@
 %check model consistency
 disp('checking model consistency');
-ismodelselfconsistent(md),
+if (solutionenum == FlaimSolutionEnum)
+        modelconsistency(true);
+        md.mesh.checkconsistency(md);
+        md.flaim.checkconsistency(md);
+        if ~modelconsistency()
+                error(' ');
+        end
+else
+        ismodelselfconsistent(md),
+end
 
 %if running qmu analysis, some preprocessing of dakota files using 
@@ -52 +61 @@
 %flaim analysis
 if (md.private.solution == FlaimSolutionEnum)
-        md=flaim(md,options);
+        md=flaim_sol(md,options);
         md.private.solution=EnumToString(options.solution_type);
         return;

issm/trunk/src/m/solutions/flaim_sol.m

@@ -1 @@
-function md=flaim(md,options)
+function md=flaim_sol(md,options)
 %QMU - apply Quantification of Margins and Uncertainties techniques 
 %      to a solution sequence (like diagnostic.m, progonstic.m, etc ...), 
@@ -58 +58 @@
         else
                 display('Converting x/y values to lat/long values.');
-                [md.mesh.lat,md.mesh.long]=xy2ll(md.x,md.y,options.latsgn);
+                [md.mesh.lat,md.mesh.long]=xy2ll(md.mesh.x,md.mesh.y,options.latsgn);
         end
 end
@@ -80 +80 @@
 
 display('Calling KMLMeshWrite.');
-KMLMeshWrite(md.miscellaneous.name,md.miscellaneous.notes,md.mesh.elements,md.nodeconnectivity,md.mesh.lat,md.mesh.long,md.qmu.partition,md.flaim.criterion,options.cmap,filekml);
+KMLMeshWrite(md.miscellaneous.name,md.miscellaneous.notes,md.mesh.elements,md.mesh.vertexconnectivity,md.mesh.lat,md.mesh.long,md.qmu.partition,md.flaim.criterion,options.cmap,filekml);
 %  for testing
 %filekml='issm-split-geikie1-targets.kml';