Changeset 27054

Timestamp:

06/10/22 14:33:30 (3 years ago)

Author:

caronlam

Message:

BUG: minor change

File:

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

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

@@ -6371 +6371 @@
         bool computerotation = false;
         bool computeviscous = false;
-        bool computesatgravi = false;
         int  horiz;
         bool istime=true;
@@ -7534 +7533 @@
         IssmDouble SealevelGrd[3]={0,0,0};
         IssmDouble RSLGrd[3]={0,0,0};
-        IssmDouble SGGrd[3]={0,0,0}; //Satellite Gravimetry
         IssmDouble UGrd[3]={0,0,0};
         IssmDouble NGrd[3]={0,0,0};
@@ -7562 +7560 @@
         bool percpu=false;
         bool planethasocean=false;
-        bool SatelliteGravi=false;
 
         this->parameters->FindParam(&nel,MeshNumberofelementsEnum);
@@ -7570 +7567 @@
         this->parameters->FindParam(&horiz,SolidearthSettingsHorizEnum);
         this->parameters->FindParam(&planethasocean,SolidearthSettingsGrdOceanEnum);
-        this->parameters->FindParam(&SatelliteGravi,SolidearthSettingsSatelliteGraviEnum);
 
         if(sal){
@@ -7598 +7594 @@
                                 this->inputs->GetArrayPtr(SealevelchangeGrotEnum,this->lid,&Grot,&size);
                                 this->inputs->GetArrayPtr(SealevelchangeGUrotEnum,this->lid,&GUrot,&size);
-                                if (SatelliteGravi) this->inputs->GetArrayPtr(SealevelchangeGSatGravirotEnum,this->lid,&GSGrot,&size);
                                 if (horiz){
                                         this->inputs->GetArrayPtr(SealevelchangeGErotEnum,this->lid,&GErot,&size);
@@ -7606 +7601 @@
                 }
                 this->SealevelchangeGxL(&RSLGrd[0],G, Gsub, Grot, loads, polarmotionvector, slgeom, nel,percpu=false,SealevelchangeViscousRSLEnum,computefuture=true);
-                if (SatelliteGravi) this->SealevelchangeGxL(&SGGrd[0],G, Gsub, GSGrot, loads, polarmotionvector, slgeom, nel,percpu=false,SealevelchangeViscousSGEnum,computefuture=true);
 
                 if(elastic){
@@ -7628 +7622 @@
         for(int i=0;i<NUMVERTICES;i++){
                 SealevelGrd[i]=UGrd[i]+RSLGrd[i];
-                if (SatelliteGravi) SGGrd[i]+=UGrd[i];
         }
 
@@ -7634 +7627 @@
         this->AddInput(SealevelGRDEnum,SealevelGrd,P1Enum);
         this->AddInput(BedGRDEnum,UGrd,P1Enum);
-        if (SatelliteGravi) this->AddInput(SatGraviGRDEnum,SGGrd,P1Enum);
         if(horiz){
                 this->AddInput(BedNorthGRDEnum,NGrd,P1Enum);