Changeset 25534 for issm/branches/trunk-larour-SLPS2020/src/c/classes/FemModel.cpp

Timestamp:

09/04/20 16:30:07 (5 years ago)

Author:

Eric.Larour

Message:

CHG: added output of bslr, bslrice and bslrhydro, as well as cumulated values.

File:

• issm/branches/trunk-larour-SLPS2020/src/c/classes/FemModel.cpp (modified) (4 diffs)

issm/branches/trunk-larour-SLPS2020/src/c/classes/FemModel.cpp

@@ -4706 +4706 @@
 #endif
 #ifdef _HAVE_SEALEVELRISE_
-void FemModel::SealevelriseEustatic(Vector<IssmDouble>* pRSLgi, IssmDouble* poceanarea, IssmDouble* peustatic, SealevelMasks* masks) { /*{{{*/
+void FemModel::SealevelriseEustatic(Vector<IssmDouble>* pRSLgi, IssmDouble* poceanarea, IssmDouble* pbslr,IssmDouble* pbslrice, IssmDouble* pbslrhydro, SealevelMasks* masks) { /*{{{*/
 
         /*serialized vectors:*/
-        IssmDouble  eustatic       = 0.;
-        IssmDouble  eustatic_cpu   = 0.;
-        IssmDouble  eustatic_cpu_e = 0.;
+        IssmDouble  bslrice       = 0.;
+        IssmDouble  bslrice_cpu   = 0.;
+        IssmDouble  bslrhydro       = 0.;
+        IssmDouble  bslrhydro_cpu   = 0.;
         IssmDouble  area      = 0.;
         IssmDouble  oceanarea      = 0.;
         IssmDouble  oceanarea_cpu  = 0.;
+        int bp_compute_fingerprints= 0;
 
    /*Initialize temporary vector that will be used to sum eustatic components
@@ -4733 +4735 @@
         _assert_(oceanarea>0.);
 
-        /*Call the sea level rise core: */
+        /*Call the sea level rise core for ice : */
+        bslrice_cpu=0;
         for(int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->SealevelriseEustatic(RSLgi,&eustatic_cpu_e,masks, oceanarea);
-                eustatic_cpu+=eustatic_cpu_e;
+                bslrice_cpu+=element->SealevelriseEustaticIce(RSLgi,masks, oceanarea);
+        }
+
+        /*Call the sea level rise core for hydro: */
+        bslrhydro_cpu=0;
+        for(int i=0;i<elements->Size();i++){
+                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
+                bslrhydro_cpu+=element->SealevelriseEustaticHydro(RSLgi,masks, oceanarea);
+        }
+
+        /*Call the sea level rise core for bottom pressures: */
+        this->parameters->FindParam(&bp_compute_fingerprints,DslComputeFingerprintsEnum);
+        if(bp_compute_fingerprints){
+                for(int i=0;i<elements->Size();i++){
+                        Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
+                        element->SealevelriseEustaticBottomPressure(RSLgi,masks);
+                }
         }
 
@@ -4745 +4763 @@
 
         /*Sum all eustatic components from all cpus:*/
-        ISSM_MPI_Reduce (&eustatic_cpu,&eustatic,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
-        ISSM_MPI_Bcast(&eustatic,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
-        _assert_(!xIsNan<IssmDouble>(eustatic));
+        ISSM_MPI_Reduce (&bslrice_cpu,&bslrice,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
+        ISSM_MPI_Bcast(&bslrice,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
+        _assert_(!xIsNan<IssmDouble>(bslrice));
+
+        ISSM_MPI_Reduce (&bslrhydro_cpu,&bslrhydro,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
+        ISSM_MPI_Bcast(&bslrhydro,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
+        _assert_(!xIsNan<IssmDouble>(bslrhydro));
 
         /*Free ressources:*/
@@ -4755 +4777 @@
         /*Assign output pointers:*/
         *poceanarea = oceanarea;
-        *peustatic  = eustatic;
+        *pbslrice  = bslrice;
+        *pbslrhydro  = bslrhydro;
+        *pbslr=bslrhydro+bslrice;
 
 }