Changeset 24940 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

05/31/20 21:40:46 (5 years ago)

Author:

Eric.Larour

Message:

CHG: replacing earth area computations with a constant coming from the
slr class.

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (14 diffs)

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

@@ -4635 +4635 @@
 void FemModel::EsaGeodetic3D(Vector<IssmDouble>* pUp, Vector<IssmDouble>* pNorth, Vector<IssmDouble>* pEast, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz){/*{{{*/
 
-        IssmDouble  eartharea=0;
-        IssmDouble  eartharea_cpu=0;
-
         int         ns,nsmax;
 
@@ -4646 +4643 @@
         for(int i=0;i<ns;i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                eartharea_cpu += element->GetAreaSpherical();
-        }
-        ISSM_MPI_Reduce (&eartharea_cpu,&eartharea,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
-        ISSM_MPI_Bcast(&eartharea,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
+        }
 
         /*Figure out max of ns: */
@@ -4659 +4653 @@
                 if(i<ns){
                         Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                        element->EsaGeodetic3D(pUp,pNorth,pEast,latitude,longitude,radius,xx,yy,zz,eartharea);
+                        element->EsaGeodetic3D(pUp,pNorth,pEast,latitude,longitude,radius,xx,yy,zz);
                 }
                 if(i%100==0){
@@ -4694 +4688 @@
 }
 /*}}}*/
-void FemModel::SealevelriseEustatic(Vector<IssmDouble>* pRSLgi, IssmDouble* peartharea, IssmDouble* poceanarea, IssmDouble* peustatic, SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius,int loop) { /*{{{*/
+void FemModel::SealevelriseEustatic(Vector<IssmDouble>* pRSLgi, IssmDouble* poceanarea, IssmDouble* peustatic, SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius,int loop) { /*{{{*/
 
         /*serialized vectors:*/
@@ -4702 +4696 @@
         IssmDouble  oceanarea      = 0.;
         IssmDouble  oceanarea_cpu  = 0.;
-        IssmDouble  eartharea      = 0.;
-        IssmDouble  eartharea_cpu = 0.;
 
    /*Initialize temporary vector that will be used to sum eustatic components
@@ -4716 +4708 @@
                 Element*   element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
                 IssmDouble area=element->GetAreaSpherical();
-                eartharea_cpu += area;
                 if (masks->isoceanin[i]) oceanarea_cpu += area;
         }
@@ -4723 +4714 @@
         _assert_(oceanarea>0.);
 
-        ISSM_MPI_Reduce (&eartharea_cpu,&eartharea,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
-        ISSM_MPI_Bcast(&eartharea,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
-
         /*Call the sea level rise core: */
         for(int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->SealevelriseEustatic(RSLgi,&eustatic_cpu_e,masks, latitude,longitude,radius,oceanarea,eartharea);
+                element->SealevelriseEustatic(RSLgi,&eustatic_cpu_e,masks, latitude,longitude,radius,oceanarea);
                 eustatic_cpu+=eustatic_cpu_e;
         }
@@ -4747 +4735 @@
 
         /*Assign output pointers:*/
-        *peartharea = eartharea;
         *poceanarea = oceanarea;
         *peustatic  = eustatic;
@@ -4753 +4740 @@
 }
 /*}}}*/
-void FemModel::SealevelriseNonEustatic(Vector<IssmDouble>* pRSLgo, Vector<IssmDouble>* pRSLg_old, IssmDouble eartharea, SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, bool verboseconvolution,int loop){/*{{{*/
+void FemModel::SealevelriseNonEustatic(Vector<IssmDouble>* pRSLgo, Vector<IssmDouble>* pRSLg_old,  SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, bool verboseconvolution,int loop){/*{{{*/
 
         /*serialized vectors:*/
@@ -4774 +4761 @@
         for(int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->SealevelriseNonEustatic(RSLgo,RSLg_old,masks, latitude,longitude,radius,eartharea);
+                element->SealevelriseNonEustatic(RSLgo,RSLg_old,masks, latitude,longitude,radius);
         }
         pRSLgo->SetValues(gsize,indices,RSLgo,ADD_VAL);
@@ -4786 +4773 @@
 }
 /*}}}*/
-void FemModel::SealevelriseRotationalFeedback(Vector<IssmDouble>* pRSLgo_rot, Vector<IssmDouble>* pRSLg_old, IssmDouble* pIxz, IssmDouble* pIyz, IssmDouble* pIzz, IssmDouble eartharea, SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius){/*{{{*/
+void FemModel::SealevelriseRotationalFeedback(Vector<IssmDouble>* pRSLgo_rot, Vector<IssmDouble>* pRSLg_old, IssmDouble* pIxz, IssmDouble* pIyz, IssmDouble* pIzz,  SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius){/*{{{*/
 
         /*serialized vectors:*/
@@ -4802 +4789 @@
         for(int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->SealevelriseMomentOfInertia(&moi_list[0],RSLg_old,masks, eartharea);
+                element->SealevelriseMomentOfInertia(&moi_list[0],RSLg_old,masks );
                 moi_list_cpu[0] += moi_list[0];
                 moi_list_cpu[1] += moi_list[1];
@@ -4862 +4849 @@
 }
 /*}}}*/
-void FemModel::SealevelriseElastic(Vector<IssmDouble>* pUp, Vector<IssmDouble>* pNorth, Vector<IssmDouble>* pEast, Vector<IssmDouble>* pRSLg, IssmDouble eartharea, SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz,int loop,int horiz){/*{{{*/
+void FemModel::SealevelriseElastic(Vector<IssmDouble>* pUp, Vector<IssmDouble>* pNorth, Vector<IssmDouble>* pEast, Vector<IssmDouble>* pRSLg, SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz,int loop,int horiz){/*{{{*/
 
         /*serialized vectors:*/
@@ -4888 +4875 @@
         for(int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->SealevelriseGeodetic(Up,North,East,RSLg,masks, latitude,longitude,radius,xx,yy,zz,eartharea,horiz);
+                element->SealevelriseGeodetic(Up,North,East,RSLg,masks, latitude,longitude,radius,xx,yy,zz,horiz);
         }