Changeset 13066

Timestamp:

08/16/12 11:35:10 (13 years ago)

Author:

Mathieu Morlighem

Message:

BUG: added loads for L1L2 approximation

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -27 +27 @@
         int dim;
         int numberofvertices;
-        bool ismacayealpattyn,isstokes;
+        bool ismacayealpattyn,isstokes,isl1l2;
         int  numpenalties,numberofpressureloads,numrifts,numriftsegments;
         double *pressureload   = NULL;
@@ -42 +42 @@
         iomodel->Constant(&dim,MeshDimensionEnum);
         iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
+        iomodel->Constant(&isl1l2,FlowequationIsl1l2Enum);
         iomodel->Constant(&isstokes,FlowequationIsstokesEnum);
         iomodel->Constant(&ismacayealpattyn,FlowequationIsmacayealpattynEnum);
@@ -53 +54 @@
 
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
-        if (!ismacayealpattyn & !isstokes){
+        if(!ismacayealpattyn & !isstokes & !isl1l2){
                 *ploads=loads;
                 return;
@@ -87 +88 @@
                 }
                 else if ((int)*(elements_type+element)==(MacAyealApproximationEnum) && dim==3){
+                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum));
+                        count++;
+                }
+                else if ((int)*(elements_type+element)==(L1L2ApproximationEnum)){
                         loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum));
                         count++;