Changeset 15539

Timestamp:

07/22/13 14:08:19 (12 years ago)

Author:

seroussi

Message:

CHG: trying ice front for coupling solutions

File:

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

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

@@ -44 +44 @@
         if(!ismacayeal & !ispattyn & !isstokes & !isl1l2) return;
 
-        /*Create pressure loads as boundary conditions. Pay attention to the partitioning if we are running in parallel (the nodes
-         * referenced by a certain load must belong to the cluster node): */
-        iomodel->FetchData(3,DiagnosticIcefrontEnum,ThicknessEnum,BedEnum);
-        iomodel->FetchData(&pressureload,&numberofpressureloads,NULL,DiagnosticIcefrontEnum);
-        iomodel->FetchData(&elements_type,NULL,NULL,FlowequationElementEquationEnum);
-
         /*Initialize counter: */
         count=0;
-
-        /*First load data:*/
-        for (i=0;i<numberofpressureloads;i++){
-
-                /*Retrieve element to which this icefront belongs: */
-                if(iomodel->dim==2) segment_width=4; 
-                else segment_width=6;
-                element=reCast<int,IssmDouble>(*(pressureload+segment_width*i+segment_width-2)-1); //element is in the penultimate column (node1 node2 ... elem fill)
-
-                /*Now, if this element is not in the partition, pass: */
-                if(!iomodel->my_elements[element]) continue;
-
-                /*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;
-                if (reCast<int,IssmDouble>(*(elements_type+element))==L1L2ApproximationEnum) continue;
-                if (reCast<int,IssmDouble>(*(elements_type+element))==PattynApproximationEnum) continue;
-                if (reCast<int,IssmDouble>(*(elements_type+element))==StokesApproximationEnum) continue;
-
-                /*Create and  add load: */
-                if (reCast<int,IssmDouble>(*(elements_type+element))==(MacAyealPattynApproximationEnum)){
-                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum));
-                        count++;
-                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,PattynIceFrontEnum,DiagnosticHorizAnalysisEnum));
-                        count++;
-                }
-                else if (reCast<int,IssmDouble>(*(elements_type+element))==(PattynStokesApproximationEnum)){
-                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,PattynIceFrontEnum,DiagnosticHorizAnalysisEnum));
-                        count++;
-                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,StokesIceFrontEnum,DiagnosticHorizAnalysisEnum));
-                        count++;
-                }
-                else if (reCast<int,IssmDouble>(*(elements_type+element))==(MacAyealStokesApproximationEnum)){
-                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,MacAyeal3dIceFrontEnum,DiagnosticHorizAnalysisEnum));
-                        count++;
-                        loads->AddObject(new Icefront(iomodel->loadcounter+count+1,i,iomodel,StokesIceFrontEnum,DiagnosticHorizAnalysisEnum));
-                        count++;
-                }
-        }
-
-        /*Free data: */
-        iomodel->DeleteData(3,DiagnosticIcefrontEnum,ThicknessEnum,BedEnum);
-        iomodel->DeleteData(elements_type,FlowequationElementEquationEnum);
-        iomodel->DeleteData(pressureload,DiagnosticIcefrontEnum);
 
         /*Create Penpair for penalties: */