Changeset 15525

Timestamp:

07/19/13 17:31:31 (12 years ago)

Author:

seroussi

Message:

FIX: temporarily reverting Front until monday to get NR running

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (1 diff)
• modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -3165 +3165 @@
         }
 
+        return NULL;
         /*If no front, return NULL*/
         if(!isfront) return NULL;

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

@@ -64 +64 @@
                 if(!iomodel->my_elements[element]) continue;
 
-                /*Do not create ice front if Hutter or MacAyeal elements*/
+                /*Do not create ice front if Hutter or Stokes elements*/
                 if (reCast<int,IssmDouble>(*(elements_type+element))==HutterApproximationEnum) continue;
-                if (reCast<int,IssmDouble>(*(elements_type+element))==MacAyealApproximationEnum) continue;
 
                 /*Create and  add load: */
-                if (reCast<int,IssmDouble>(*(elements_type+element))==(L1L2ApproximationEnum)){
+                if (reCast<int,IssmDouble>(*(elements_type+element))==(MacAyealApproximationEnum) && iomodel->dim==2){
+                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal2dIceFrontEnum,DiagnosticHorizAnalysisEnum));
+                        count++;
+                }
+                else if (reCast<int,IssmDouble>(*(elements_type+element))==(MacAyealApproximationEnum) && iomodel->dim==3){
+                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum));
+                        count++;
+                }
+                else if (reCast<int,IssmDouble>(*(elements_type+element))==(L1L2ApproximationEnum)){
                         loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum));
                         count++;