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

Timestamp:

03/15/21 21:27:31 (4 years ago)

Author:

Eric.Larour

Message:

CHG: new ElementCoordinatesx module, use for an optimized
version of the sea level core. Many bug fixes to get test2002
to run.

File:

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

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

@@ -844 +844 @@
                 case TransientSolutionEnum:{
                         /*We have multiple analyses here, process one by one*/
-                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslc,isesa,issampling;
+                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isoceantransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslc,isesa,issampling;
                         iomodel->FindConstant(&isthermal,"md.transient.isthermal");
                         iomodel->FindConstant(&ismovingfront,"md.transient.ismovingfront");
                         iomodel->FindConstant(&ismasstransport,"md.transient.ismasstransport");
+                        iomodel->FindConstant(&isoceantransport,"md.transient.isoceantransport");
                         iomodel->FindConstant(&isstressbalance,"md.transient.isstressbalance");
                         iomodel->FindConstant(&isgroundingline,"md.transient.isgroundingline");
@@ -892 +893 @@
                         if(isdamage){
                                 analyses_temp[numanalyses++]=DamageEvolutionAnalysisEnum;
+                        }
+                        if(isoceantransport){
+                                analyses_temp[numanalyses++]=OceantransportAnalysisEnum;
                         }
                         if(isslc){
@@ -4744 +4748 @@
 /*}}}*/
 #endif
-#ifdef _HAVE_SEALEVELRISE_
+#ifdef _HAVE_SEALEVELCHANGE_
 void FemModel::SealevelchangeBarystatic(Vector<IssmDouble>* pRSLgi, IssmDouble* poceanarea, IssmDouble* pbslc,IssmDouble* pbslcice, IssmDouble* pbslchydro, IssmDouble** pbslcice_partition,IssmDouble** pbslchydro_partition,SealevelMasks* masks) { /*{{{*/
 
@@ -4756 +4760 @@
         IssmDouble  oceanarea_cpu  = 0.;
         int bp_compute_fingerprints= 0;
+        bool isoceantransport=false;
 
         Vector<IssmDouble>* bslcice_partition=NULL;
@@ -4765 +4770 @@
         IssmDouble* bslchydro_partition_serial=NULL;
         IssmDouble* partitionhydro=NULL;
+        bool istws=0;
         int nparthydro;
-        bool istws;
-
+                
+        int npartocean;
+        Vector<IssmDouble>* bslcocean_partition=NULL;
+        IssmDouble* bslcocean_partition_serial=NULL;
+        IssmDouble* partitionocean=NULL;
 
    /*Initialize temporary vector that will be used to sum barystatic components
@@ -4800 +4809 @@
                 bslchydro_partition= new Vector<IssmDouble>(nparthydro);
         }
+
+        this->parameters->FindParam(&npartocean,SolidearthNpartOceanEnum);
+        if(npartocean){
+                this->parameters->FindParam(&partitionocean,&nel,NULL,SolidearthPartitionOceanEnum);
+                bslchydro_partition= new Vector<IssmDouble>(npartocean);
+        }
+        /*For later:
+        npartbarystatic=npartice;
+        if(nparthydro>npartbarystatic)npartbarystatic=nparthydro;
+        if(npartocean>npartbarystatic)npartbarystatic=npartocean;
+        bslc_partition=new Matrix(IssmDouble>(npartbarystatic,3);
+
+        bslc_cpu[0]=0; bslc_cpu[1]=0; bslc_cpu[2]=0;
+        for(Object* & object : this->elements->objects){
+                Element* element = xDynamicCast<Element*>(object);
+                element->SealevelchangeBarystaticLoads(&bslc_cpu[0], localloads,masks, bslcice_partition,partitionice,oceanarea);
+        }
+        MPI Bcast localloads -> loads
+
+        for(Object* & object : this->elements->objects){
+                Element* element = xDynamicCast<Element*>(object);
+                element->SealevelchangeConvolution(loads);
+        }
+        */
+
+
+
 
 
@@ -4821 +4857 @@
         /*Call the barystatic sea level change core for bottom pressures: */
         this->parameters->FindParam(&bp_compute_fingerprints,SolidearthSettingsComputeBpGrdEnum);
-        if(bp_compute_fingerprints){
+        this->parameters->FindParam(&isoceantransport,TransientIsoceantransportEnum);
+        if(bp_compute_fingerprints && isoceantransport){
                 for(int i=0;i<elements->Size();i++){
                         Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
@@ -5108 +5145 @@
                 element->GiaDeflection(wg,dwgdt, matlitho, x,y);
         }
+
+        /*Assemble parallel vector:*/
+        dwgdt->Assemble();
+        wg->Assemble();
 }
 /*}}}*/