Changeset 15525


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r15523 r15525  
    31653165        }
    31663166
     3167        return NULL;
    31673168        /*If no front, return NULL*/
    31683169        if(!isfront) return NULL;
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

    r15523 r15525  
    6464                if(!iomodel->my_elements[element]) continue;
    6565
    66                 /*Do not create ice front if Hutter or MacAyeal elements*/
     66                /*Do not create ice front if Hutter or Stokes elements*/
    6767                if (reCast<int,IssmDouble>(*(elements_type+element))==HutterApproximationEnum) continue;
    68                 if (reCast<int,IssmDouble>(*(elements_type+element))==MacAyealApproximationEnum) continue;
    6968
    7069                /*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)){
    7279                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum));
    7380                        count++;
Note: See TracChangeset for help on using the changeset viewer.