Changeset 15567 for issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp

Timestamp:

07/23/13 14:30:29 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: MacAyeal -> SSA

File:

• issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp (modified) (10 diffs)

issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp

@@ -65 +65 @@
         icefront_mparid = iomodel->numberofelements+1;
 
-        if (in_icefront_type==MacAyeal2dIceFrontEnum || in_icefront_type==MacAyeal3dIceFrontEnum){
+        if (in_icefront_type==SSA2dIceFrontEnum || in_icefront_type==SSA3dIceFrontEnum){
                 numnodes    = 2;
                 numvertices = 2;
@@ -152 +152 @@
 //      icefront_mparid=numberofelements+1; //matlab indexing
 //
-        if (in_icefront_type==MacAyeal2dIceFrontEnum || in_icefront_type==MacAyeal3dIceFrontEnum){
+        if (in_icefront_type==SSA2dIceFrontEnum || in_icefront_type==SSA3dIceFrontEnum){
 //              icefront_node_ids[0]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+0));
 //              icefront_node_ids[1]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+1));
@@ -375 +375 @@
 
         switch(type){
-                case MacAyeal2dIceFrontEnum:
-                case MacAyeal3dIceFrontEnum:
+                case SSA2dIceFrontEnum:
+                case SSA3dIceFrontEnum:
                         for(int i=0;i<NUMVERTICESSEG;i++) sidlist[i]=nodes[i]->Sid();
                         return;
@@ -397 +397 @@
 
         switch(type){
-                case MacAyeal2dIceFrontEnum:
+                case SSA2dIceFrontEnum:
                         return NUMVERTICESSEG;
 #ifdef _HAVE_3D_
-                case MacAyeal3dIceFrontEnum:
+                case SSA3dIceFrontEnum:
                         return NUMVERTICESSEG;
                 case HOIceFrontEnum:
@@ -559 +559 @@
 
         switch(type){
-                case MacAyeal2dIceFrontEnum:
-                        return CreatePVectorDiagnosticMacAyeal2d();
+                case SSA2dIceFrontEnum:
+                        return CreatePVectorDiagnosticSSA2d();
         #ifdef _HAVE_3D_
-                case MacAyeal3dIceFrontEnum:
-                        return CreatePVectorDiagnosticMacAyeal3d();
+                case SSA3dIceFrontEnum:
+                        return CreatePVectorDiagnosticSSA3d();
                 case HOIceFrontEnum:
                         return CreatePVectorDiagnosticHO();
@@ -574 +574 @@
 }
 /*}}}*/
-/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal2d{{{*/
-ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal2d(void){
+/*FUNCTION Icefront::CreatePVectorDiagnosticSSA2d{{{*/
+ElementVector* Icefront::CreatePVectorDiagnosticSSA2d(void){
 
         /*Intermediary*/
@@ -595 +595 @@
 
         /*Initialize Element vector and vectors*/
-        ElementVector* pe=new ElementVector(tria->nodes,numnodes,this->parameters,MacAyealApproximationEnum);
+        ElementVector* pe=new ElementVector(tria->nodes,numnodes,this->parameters,SSAApproximationEnum);
         IssmDouble*    basis = xNew<IssmDouble>(numnodes);
 
@@ -669 +669 @@
 #endif
 #ifdef _HAVE_3D_
-/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{*/
-ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal3d(void){
+/*FUNCTION Icefront::CreatePVectorDiagnosticSSA3d{{{*/
+ElementVector* Icefront::CreatePVectorDiagnosticSSA3d(void){
 
         Icefront *icefront = NULL;
@@ -682 +682 @@
         if(!penta->IsOnBed() || penta->IsOnWater()) return NULL;
 
-        /*Spawn Tria and call MacAyeal2d*/
+        /*Spawn Tria and call SSA2d*/
         tria    =(Tria*)penta->SpawnTria(0,1,2);
         icefront=(Icefront*)this->copy();
         icefront->element=tria;
-        icefront->inputs->AddInput(new IntInput(IceFrontTypeEnum,MacAyeal2dIceFrontEnum));
-        ElementVector* pe=icefront->CreatePVectorDiagnosticMacAyeal2d();
+        icefront->inputs->AddInput(new IntInput(IceFrontTypeEnum,SSA2dIceFrontEnum));
+        ElementVector* pe=icefront->CreatePVectorDiagnosticSSA2d();
 
         /*clean-up and return*/
@@ -870 +870 @@
 
         /*How many nodes? :*/
-        if(type==MacAyeal2dIceFrontEnum || type==MacAyeal3dIceFrontEnum)
+        if(type==SSA2dIceFrontEnum || type==SSA3dIceFrontEnum)
          numberofnodes=2;
         else