Changeset 4994

Timestamp:

08/04/10 20:34:26 (15 years ago)

Author:

Eric.Larour

Message:

Improved MeshProfileIntersectionx, was ignoring segments inside elements.
Improved qmu setup to include surface and bed inputs. still not working though.
Made new plot for qmu mass flux segmnets.

Location:

issm/trunk/src

Files:

• c/modules/MeshProfileIntersectionx/ElementSegment.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp (modified) (1 diff)
• m/classes/public/plot/plot_manager.m (modified) (1 diff)
• m/classes/public/plot/plot_qmu_mass_flux_segments.m (added)
• m/qmu/setupdesign/QmuSetupDesign.m (modified) (1 diff)
• m/qmu/setupdesign/setupbed.m (added)
• m/qmu/setupdesign/setupsurface.m (added)
• m/utils/Exp/expcreatecircle.m (modified) (1 diff)

issm/trunk/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp

@@ -85 +85 @@
                 segments_dataset->AddObject(new  Segment(el+1,xfinal[0],yfinal[0],xfinal[1],yfinal[1]));
         }
+        else{
+                /*No interesections, but the segment might be entirely inside this triangle!: */
+                if ( (NodeInElement(xgrids,ygrids,xsegment[0],ysegment[0])) && (NodeInElement(xgrids,ygrids,xsegment[1],ysegment[1])) ){
+                        segments_dataset->AddObject(new  Segment(el+1,xsegment[0],ysegment[0],xsegment[1],ysegment[1]));
+                }
+        }
 }

issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp

@@ -151 +151 @@
                         descriptor=variabledescriptors[i];
 
-                        if ((strcmp(descriptor,"Thickness")==0) ||
-                                (strcmp(descriptor,"DragCoefficient")     ==0)
+                        if ((strcmp(descriptor,"Thickness")==0) || (strcmp(descriptor,"DragCoefficient")     ==0) || (strcmp(descriptor,"Surface")     ==0) || (strcmp(descriptor,"Bed")     ==0)
+
+
                                 ){
 

issm/trunk/src/m/classes/public/plot/plot_manager.m

@@ -45 +45 @@
                         plot_gridnumbering(md,options,subplotwidth,i);
                         return;
+                case 'qmu_mass_flux_segments',
+                        plot_qmu_mass_flux_segments(md,options,nlines,ncols,i);
+                        return;
+
                 case 'highlightgrids',
                         plot_highlightgrids(md,options,subplotwidth,i);

issm/trunk/src/m/qmu/setupdesign/QmuSetupDesign.m

@@ -29 +29 @@
         dvar=setupthickness(dvar,variables,params,varargin{:});
 
+elseif strcmpi(descriptor,'Surface')
+
+        dvar=setupsurface(dvar,variables,params,varargin{:});
+
+elseif strcmpi(descriptor,'Bed')
+
+        dvar=setupbed(dvar,variables,params,varargin{:});
+
 elseif strcmpi(descriptor,'DragCoefficient')
 

issm/trunk/src/m/utils/Exp/expcreatecircle.m

@@ -11 +11 @@
 
 %Calculate the cartesians coordinates of the points
-x_list=ones(numberofgrids,1);
-y_list=ones(numberofgrids,1);
+x_list=ones(numberofgrids+1,1);
+y_list=ones(numberofgrids+1,1);
 
 theta=(0:2*pi/numberofgrids:2*pi*(1-1/numberofgrids))';
+theta=[theta;0];
 
 x_list=radius*x_list.*cos(theta);