Changeset 16533

Timestamp:

10/23/13 11:54:05 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: created datasets for SmoothedSurfaceAnalysis

Location:

issm/trunk-jpl/src/c

Files:

• cores/AnalysisConfiguration.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateDataSets.cpp (modified) (1 diff)
• modules/ModelProcessorx/DistributeNumDofs.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/AnalysisConfiguration.cpp

@@ -82 +82 @@
 
                 case BalancevelocitySolutionEnum:
-                        numanalyses=2;
+                        numanalyses=3;
                         analyses=xNew<int>(numanalyses);
                         analyses[0]=BalancevelocityAnalysisEnum;
-                        analyses[1]=L2ProjectionBaseAnalysisEnum;
+                        analyses[1]=SmoothedSurfaceSlopeXAnalysisEnum;
+                        analyses[2]=SmoothedSurfaceSlopeYAnalysisEnum;
                         break;
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp

@@ -119 +119 @@
                         CreateLoadsBalancevelocity(ploads,iomodel);
                         UpdateElementsBalancevelocity(elements,iomodel,analysis_counter,analysis_type);
+                        break;
+                case SmoothedSurfaceSlopeXAnalysisEnum:
+                        iomodel->FetchData(1,MeshVertexonbedEnum);
+                        CreateNodes(pnodes,iomodel,SmoothedSurfaceSlopeXAnalysisEnum,P1Enum);
+                        iomodel->DeleteData(1,MeshVertexonbedEnum);
+                        UpdateElementsL2ProjectionBase(elements,iomodel,analysis_counter,analysis_type);
+                        break;
+                case SmoothedSurfaceSlopeYAnalysisEnum:
+                        iomodel->FetchData(1,MeshVertexonbedEnum);
+                        CreateNodes(pnodes,iomodel,SmoothedSurfaceSlopeYAnalysisEnum,P1Enum);
+                        iomodel->DeleteData(1,MeshVertexonbedEnum);
+                        UpdateElementsL2ProjectionBase(elements,iomodel,analysis_counter,analysis_type);
                         break;
                 #endif

issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp

@@ -143 +143 @@
                         numdofs=1;
                         break;
+                case SmoothedSurfaceSlopeXAnalysisEnum:
+                        numdofs=1;
+                        break;
+                case SmoothedSurfaceSlopeYAnalysisEnum:
+                        numdofs=1;
+                        break;
                 default:
                         _error_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet");