Changeset 24443

Timestamp:

12/05/19 17:16:27 (5 years ago)

Author:

Eric.Larour

Message:

CHG: new function UpdateStericRate

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.h (modified) (1 diff)
• Penta.h (modified) (1 diff)
• Seg.h (modified) (1 diff)
• Tetra.h (modified) (1 diff)
• Tria.cpp (modified) (1 diff)
• Tria.h (modified) (1 diff)

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

@@ -372 +372 @@
                 #endif
                 #ifdef _HAVE_SEALEVELRISE_
+                virtual void UpdateStericRate(int steric_rate_model)=0;
                 virtual IssmDouble    GetArea3D(void)=0;
                 virtual IssmDouble    GetAreaSpherical(void)=0;

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

@@ -210 +210 @@
                 #endif
                 #ifdef _HAVE_SEALEVELRISE_
+                void UpdateStericRate(int steric_rate_model){_error_("not implemented yet!");};
                 IssmDouble    OceanArea(void){_error_("not implemented yet!");};
                 IssmDouble    OceanAverage(IssmDouble* Sg){_error_("not implemented yet!");};

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

@@ -171 +171 @@
 #endif
 #ifdef _HAVE_SEALEVELRISE_
+                void UpdateStericRate(int steric_rate_model){_error_("not implemented yet!");};
                 void    SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea){_error_("not implemented yet!");};
                 void    SealevelriseEustatic(Vector<IssmDouble>* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea){_error_("not implemented yet!");};

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

@@ -177 +177 @@
 #endif
 #ifdef _HAVE_SEALEVELRISE_
+                void UpdateStericRate(int steric_rate_model){_error_("not implemented yet!");};
                 void    SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea){_error_("not implemented yet!");};
                 void    SealevelriseEustatic(Vector<IssmDouble>* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea){_error_("not implemented yet!");};

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

@@ -5436 +5436 @@
 #endif
 #ifdef _HAVE_SEALEVELRISE_
+void    Tria::UpdateStericRate(int steric_rate_model){ /*{{{*/
+
+        if (steric_rate_model==0){
+                //do nothing
+        }
+        else if (steric_rate_model==1){
+                IssmDouble eof1[3],eof2[3],eof3[3],eof4[3];
+                IssmDouble steric_rate[3];
+                IssmDouble pc1,pc2,pc3,pc4;
+
+                GetInputListOnVertices(&eof1[0],SealevelriseModeleoftrendEof1Enum);
+                GetInputListOnVertices(&eof2[0],SealevelriseModeleoftrendEof2Enum);
+                GetInputListOnVertices(&eof3[0],SealevelriseModeleoftrendEof3Enum);
+                GetInputListOnVertices(&eof4[0],SealevelriseModeleoftrendEof4Enum);
+        
+                Input* pc1_input = inputs->GetInput(SealevelriseModeleoftrendPc1Enum); _assert_(pc1_input);
+                Input* pc2_input = inputs->GetInput(SealevelriseModeleoftrendPc2Enum); _assert_(pc2_input);
+                Input* pc3_input = inputs->GetInput(SealevelriseModeleoftrendPc3Enum); _assert_(pc3_input);
+                Input* pc4_input = inputs->GetInput(SealevelriseModeleoftrendPc4Enum); _assert_(pc4_input);
+                
+                pc1_input->GetInputValue(&pc1);
+                pc2_input->GetInputValue(&pc2);
+                pc3_input->GetInputValue(&pc3);
+                pc4_input->GetInputValue(&pc4);
+
+                for (int i=0;i<4;i++)steric_rate[i]=pc1*eof1[i]+pc2*eof2[i]+pc3*eof3[i]+pc4*eof4[i];
+
+                /*upate input: */
+                this->inputs->AddInput(new TriaInput(SealevelriseStericRateEnum,&steric_rate[0],P1Enum));
+
+        else{
+
+        
+        }
+}
+/*}}}*/
 IssmDouble    Tria::OceanArea(void){ /*{{{*/
 

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

@@ -163 +163 @@
                 #endif
                 #ifdef _HAVE_SEALEVELRISE_
+                void UpdateStericRate(int steric_rate_model);
                 IssmDouble OceanArea(void);
                 IssmDouble OceanAverage(IssmDouble* Sg);