Changeset 15525
- Timestamp:
- 07/19/13 17:31:31 (12 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
r15523 r15525 3165 3165 } 3166 3166 3167 return NULL; 3167 3168 /*If no front, return NULL*/ 3168 3169 if(!isfront) return NULL; -
issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp
r15523 r15525 64 64 if(!iomodel->my_elements[element]) continue; 65 65 66 /*Do not create ice front if Hutter or MacAyealelements*/66 /*Do not create ice front if Hutter or Stokes elements*/ 67 67 if (reCast<int,IssmDouble>(*(elements_type+element))==HutterApproximationEnum) continue; 68 if (reCast<int,IssmDouble>(*(elements_type+element))==MacAyealApproximationEnum) continue;69 68 70 69 /*Create and add load: */ 71 if (reCast<int,IssmDouble>(*(elements_type+element))==(L1L2ApproximationEnum)){ 70 if (reCast<int,IssmDouble>(*(elements_type+element))==(MacAyealApproximationEnum) && iomodel->dim==2){ 71 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal2dIceFrontEnum,DiagnosticHorizAnalysisEnum)); 72 count++; 73 } 74 else if (reCast<int,IssmDouble>(*(elements_type+element))==(MacAyealApproximationEnum) && iomodel->dim==3){ 75 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum)); 76 count++; 77 } 78 else if (reCast<int,IssmDouble>(*(elements_type+element))==(L1L2ApproximationEnum)){ 72 79 loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum)); 73 80 count++;
Note:
See TracChangeset
for help on using the changeset viewer.