Changeset 21578

Timestamp:

02/28/17 16:26:19 (8 years ago)

Author:

adhikari

Message:

CHG: GiaIvins is switched back to Gia

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Element.cpp (modified) (1 diff)
• Elements/Element.h (modified) (1 diff)
• Elements/Penta.cpp (modified) (1 diff)
• Elements/Penta.h (modified) (1 diff)
• Elements/Seg.h (modified) (1 diff)
• Elements/Tetra.h (modified) (1 diff)
• Elements/Tria.cpp (modified) (7 diffs)
• Elements/Tria.h (modified) (1 diff)
• FemModel.cpp (modified) (6 diffs)
• FemModel.h (modified) (1 diff)
• GiaDeflectionCoreArgs.h (added)
• GiaIvinsDeflectionCoreArgs.h (deleted)
• classes.h (modified) (1 diff)

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

@@ -1562 +1562 @@
                                 name==EsaEmotionEnum || 
                                 name==EsaDeltathicknessEnum || 
-                                name==GiaIvinsWEnum || 
-                                name==GiaIvinsdWdtEnum ||
+                                name==GiaWEnum || 
+                                name==GiadWdtEnum ||
                                 name==SedimentHeadEnum ||
                                 name==EplHeadEnum ||

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -294 +294 @@
                 virtual void       ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum)=0;
 
-                #ifdef _HAVE_GIAIVINS_
-                virtual void       GiaIvinsDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y)=0;
+                #ifdef _HAVE_GIA_
+                virtual void       GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y)=0;
                 #endif
                 #ifdef _HAVE_ESA_

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

@@ -3536 +3536 @@
 /*}}}*/
 
-#ifdef _HAVE_GIAIVINS_
-void       Penta::GiaIvinsDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y){/*{{{*/
-        _error_("GIAIVINS deflection not implemented yet!");
+#ifdef _HAVE_GIA_
+void       Penta::GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y){/*{{{*/
+        _error_("GIA deflection not implemented yet!");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -182 +182 @@
                 #endif
 
-                #ifdef _HAVE_GIAIVINS_
-                void           GiaIvinsDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y);
+                #ifdef _HAVE_GIA_
+                void           GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y);
                 #endif
                 #ifdef _HAVE_ESA_

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -165 +165 @@
                 IssmDouble     GetAreaSpherical(void){_error_("not implemented yet!");};
 
-#ifdef _HAVE_GIAIVINS_
-                void        GiaIvinsDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");};
+#ifdef _HAVE_GIA_
+                void        GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");};
 #endif
 #ifdef _HAVE_ESA_

issm/trunk-jpl/src/c/classes/Elements/Tetra.h

@@ -172 +172 @@
                 void        ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum);
 
-#ifdef _HAVE_GIAIVINS_
-                void        GiaIvinsDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");};
+#ifdef _HAVE_GIA_
+                void        GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");};
 #endif
 #ifdef _HAVE_ESA_

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

@@ -15 +15 @@
 #include "../classes.h"
 #include "../../shared/shared.h"
-#ifdef _HAVE_GIAIVINS_
-#include "../../modules/GiaIvinsDeflectionCorex/GiaIvinsDeflectionCorex.h"
+#ifdef _HAVE_GIA_
+#include "../../modules/GiaDeflectionCorex/GiaDeflectionCorex.h"
 #endif
 /*}}}*/
@@ -3453 +3453 @@
 /*}}}*/
 
-#ifdef _HAVE_GIAIVINS_
-void       Tria::GiaIvinsDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x, IssmDouble* y){/*{{{*/
+#ifdef _HAVE_GIA_
+void       Tria::GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x, IssmDouble* y){/*{{{*/
 
         int i;
@@ -3492 +3492 @@
         IssmDouble  dwidt;
 
-        /*arguments to GiaIvinsDeflectionCorex: */
-        GiaIvinsDeflectionCoreArgs arguments;
+        /*arguments to GiaDeflectionCorex: */
+        GiaDeflectionCoreArgs arguments;
 
         /*how many dofs are we working with here? */
@@ -3500 +3500 @@
 
         /*recover gia solution parameters: */
-        this->parameters->FindParam(&cross_section_shape,GiaIvinsCrossSectionShapeEnum);
+        this->parameters->FindParam(&cross_section_shape,GiaCrossSectionShapeEnum);
 
         /*what time is it? :*/
@@ -3518 +3518 @@
 
         /*recover mantle viscosity: */
-        mantle_viscosity_input=inputs->GetInput(GiaIvinsMantleViscosityEnum);
+        mantle_viscosity_input=inputs->GetInput(GiaMantleViscosityEnum);
         if (!mantle_viscosity_input)_error_("mantle viscosity input needed to compute gia deflection!");
         mantle_viscosity_input->GetInputAverage(&mantle_viscosity);
 
         /*recover lithosphere thickness: */
-        lithosphere_thickness_input=inputs->GetInput(GiaIvinsLithosphereThicknessEnum);
+        lithosphere_thickness_input=inputs->GetInput(GiaLithosphereThicknessEnum);
         if (!lithosphere_thickness_input)_error_("lithosphere thickness input needed to compute gia deflection!");
         lithosphere_thickness_input->GetInputAverage(&lithosphere_thickness);
@@ -3538 +3538 @@
         y0=(xyz_list[0][1]+xyz_list[1][1]+xyz_list[2][1])/3.0;
 
-        /*start loading GiaIvinsDeflectionCore arguments: */
+        /*start loading GiaDeflectionCore arguments: */
         arguments.re=re;
         arguments.hes=hes;
@@ -3564 +3564 @@
 
                 /*for this Tria, compute contribution to rebound at vertex i: */
-                GiaIvinsDeflectionCorex(&wi,&dwidt,&arguments);
+                GiaDeflectionCorex(&wi,&dwidt,&arguments);
 
                 /*plug value into solution vector: */

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

@@ -141 +141 @@
                 void        ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum);
 
-                #ifdef _HAVE_GIAIVINS_
-                void   GiaIvinsDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y);
+                #ifdef _HAVE_GIA_
+                void   GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y);
                 #endif
                 #ifdef _HAVE_ESA_

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -628 +628 @@
                         break;
 
-                case GiaIvinsSolutionEnum:
+                case GiaSolutionEnum:
                         analyses_temp[numanalyses++]=GiaIvinsAnalysisEnum;
                         break;
@@ -649 +649 @@
 
                 case TransientSolutionEnum:{
-                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr,isesa,isgiaivins;
+                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr,isesa,isgia;
                         iomodel->FindConstant(&isSIA,"md.flowequation.isSIA");
                         iomodel->FindConstant(&isFS,"md.flowequation.isFS");
@@ -663 +663 @@
                         iomodel->FindConstant(&isslr,"md.transient.isslr");
                         iomodel->FindConstant(&isesa,"md.transient.isesa");
-                        iomodel->FindConstant(&isgiaivins,"md.transient.isgiaivins");
+                        iomodel->FindConstant(&isgia,"md.transient.isgia");
                         if(isstressbalance){
                                 int  fe_FS;
@@ -710 +710 @@
                                 analyses_temp[numanalyses++]=EsaAnalysisEnum;
                         }
-                        if(isgiaivins){
+                        if(isgia){
                                 analyses_temp[numanalyses++]=GiaIvinsAnalysisEnum;
                         }
@@ -2317 +2317 @@
 /*}}}*/
 #endif
-#ifdef _HAVE_GIAIVINS_
+#ifdef _HAVE_GIA_
 void FemModel::Deflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt, IssmDouble* x, IssmDouble* y){ /*{{{*/
 
@@ -2323 +2323 @@
         for(int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->GiaIvinsDeflection(wg,dwgdt, x,y);
+                element->GiaDeflection(wg,dwgdt, x,y);
         }
 }

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -117 +117 @@
                 void ThicknessAbsGradientx( IssmDouble* pJ);
                 void ThicknessPositivex(IssmDouble* pJ);
-                #ifdef _HAVE_GIAIVINS_
+                #ifdef _HAVE_GIA_
                 void Deflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt, IssmDouble* x, IssmDouble* y);
                 #endif

issm/trunk-jpl/src/c/classes/classes.h

@@ -126 +126 @@
 #include "./Update.h"
 #include "./FemModel.h"
-#include "./GiaIvinsDeflectionCoreArgs.h"
+#include "./GiaDeflectionCoreArgs.h"
 #include "./RiftStruct.h"