Index: /issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp (revision 27060) +++ /issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp (revision 27061) @@ -264,4 +264,7 @@ parameters->AddObject(new DoubleParam(SolidearthSettingsTimeAccEnum,timeacc)); + parameters->AddObject(new DoubleMatParam(LoadLoveHEnum,love_h,ndeg,precomputednt)); + parameters->AddObject(new DoubleMatParam(LoadLoveKEnum,love_k,ndeg,precomputednt)); + parameters->AddObject(new DoubleMatParam(LoadLoveLEnum,love_l,ndeg,precomputednt)); if (rotation){ @@ -271,4 +274,10 @@ iomodel->FetchData(&love_pmtf_colinear,&dummy,&precomputednt,"md.solidearth.lovenumbers.pmtf_colinear"); iomodel->FetchData(&love_pmtf_ortho,&dummy,&precomputednt,"md.solidearth.lovenumbers.pmtf_ortho"); + + parameters->AddObject(new DoubleMatParam(LovePolarMotionTransferFunctionColinearEnum,love_pmtf_colinear,1,precomputednt)); + parameters->AddObject(new DoubleMatParam(LovePolarMotionTransferFunctionOrthogonalEnum,love_pmtf_ortho,1,precomputednt)); + parameters->AddObject(new DoubleMatParam(TidalLoveHEnum,love_th,ndeg,precomputednt)); + parameters->AddObject(new DoubleMatParam(TidalLoveKEnum,love_tk,ndeg,precomputednt)); + parameters->AddObject(new DoubleMatParam(TidalLoveLEnum,love_tl,ndeg,precomputednt)); } @@ -586,22 +595,13 @@ xDelete(G_viscoelastic); xDelete(G_viscoelastic_local); - xDelete(G_viscoelastic_interpolated); xDelete(U_viscoelastic); xDelete(U_viscoelastic_local); - xDelete(U_viscoelastic_interpolated); if(horiz){ xDelete(H_viscoelastic); xDelete(H_viscoelastic_local); - xDelete(H_viscoelastic_interpolated); } if(rotation){ - xDelete(Love_th2_interpolated); - xDelete(Love_tk2_interpolated); - if (horiz) xDelete(Love_tl2_interpolated); xDelete(love_pmtf_colinear); xDelete(love_pmtf_ortho); - xDelete(Pmtf_col_interpolated); - xDelete(Pmtf_ortho_interpolated); - xDelete(Pmtf_z_interpolated); } Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 27060) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 27061) @@ -6398,5 +6398,4 @@ IssmDouble* LoveRothoriz = NULL; IssmDouble* Grot = NULL; - IssmDouble* GUrot = NULL; IssmDouble* GNrot = NULL; @@ -6584,8 +6583,7 @@ LoveRotRSL = xNewZeroInit(nt); LoveRotU = xNewZeroInit(nt); - if (horiz) LoveRothoriz= xNewZeroInit(nt); + LoveRothoriz= xNewZeroInit(nt); Grot = xNewZeroInit(3*3*nt); //3 polar motion components * 3 vertices * number of time steps GUrot = xNewZeroInit(3*3*nt); - if (horiz){ @@ -6681,5 +6679,4 @@ this->inputs->SetArrayInput(SealevelchangeViscousUEnum,this->lid,viscousU,3*nt); this->parameters->SetParam(0,SealevelchangeViscousIndexEnum); - if(horiz){ viscousN=xNewZeroInit(3*nt); @@ -6694,73 +6691,34 @@ #ifdef _HAVE_RESTRICT_ delete G; - delete G_gravi_precomputed; if(computeelastic){ delete GU; - delete G_viscoelastic_precomputed; - delete U_viscoelastic_precomputed; if(horiz){ delete GN; delete GE; - delete H_viscoelastic_precomputed; } if(computerotation){ delete Grot; delete GUrot; - delete tide_love_h; - delete tide_love_k; - delete LoveRotRSL; - delete LoveRotU; if (horiz){ delete GNrot; delete GErot; - delete tide_love_l; - delete LoveRothoriz; - } - } - } - if(computeviscous){ - delete viscousRSL; - delete viscousU; - - if(horiz){ - delete viscousN; - delete viscousE; + } } } #else xDelete(G); - xDelete(G_gravi_precomputed); if(computeelastic){ xDelete(GU); - xDelete(G_viscoelastic_precomputed); - xDelete(U_viscoelastic_precomputed); if(horiz){ xDelete(GN); xDelete(GE); - xDelete(H_viscoelastic_precomputed); } if(computerotation){ xDelete(Grot); xDelete(GUrot); - xDelete(tide_love_h); - xDelete(tide_love_k); - xDelete(LoveRotRSL); - xDelete(LoveRotU); if (horiz){ xDelete(GNrot); xDelete(GErot); - xDelete(tide_love_l); - xDelete(LoveRothoriz); - } - } - - } - if(computeviscous){ - xDelete(viscousRSL); - xDelete(viscousU); - - if(horiz){ - xDelete(viscousN); - xDelete(viscousE); + } } } @@ -7304,11 +7262,7 @@ } xDelete(Gsubel); - xDelete(G_gravi_precomputed); if(computeelastic){ xDelete(GUsubel); - xDelete(G_viscoelastic_precomputed); - xDelete(U_viscoelastic_precomputed); if(horiz){ - xDelete(H_viscoelastic_precomputed); xDelete(GNsubel); xDelete(GEsubel); @@ -7324,5 +7278,4 @@ /*Inputs:*/ IssmDouble* viscousRSL=NULL; - IssmDouble* viscousSG=NULL; IssmDouble* viscousU=NULL; IssmDouble* viscousN=NULL; @@ -7357,10 +7310,4 @@ } - /*Free ressources*/ - xDelete(viscousRSL); - xDelete(viscousU); - xDelete(viscousN); - xDelete(viscousE); - } /*}}}*/ @@ -7446,6 +7393,4 @@ barycontrib->Set(this->Sid(),bslcice,bslchydro,bslcbp); - xDelete(areae); - } /*}}}*/ @@ -7455,5 +7400,5 @@ IssmDouble* G=NULL; IssmDouble* Grot=NULL; - IssmDouble** Gsub=NULL; + IssmDouble* Gsub[SLGEOM_NUMLOADS]; bool computefuture=false; @@ -7465,5 +7410,4 @@ int nel,nbar; - Gsub=xNew(SLGEOM_NUMLOADS); this->parameters->FindParam(&sal,SolidearthSettingsSelfAttractionEnum); @@ -7481,8 +7425,4 @@ this->SealevelchangeGxL(sealevelpercpu, G, Gsub, Grot, loads, polarmotionvector, slgeom, nel,percpu=true,SealevelchangeViscousRSLEnum,computefuture=false); } - - xDelete(G); - xDelete(Grot); - xDelete(Gsub); return; @@ -7538,12 +7478,11 @@ IssmDouble* GN=NULL; IssmDouble* Grot=NULL; - IssmDouble* GSGrot=NULL; IssmDouble* GUrot=NULL; IssmDouble* GNrot=NULL; IssmDouble* GErot=NULL; - IssmDouble** Gsub; - IssmDouble** GUsub; - IssmDouble** GNsub; - IssmDouble** GEsub; + IssmDouble* Gsub[SLGEOM_NUMLOADS]; + IssmDouble* GUsub[SLGEOM_NUMLOADS]; + IssmDouble* GNsub[SLGEOM_NUMLOADS]; + IssmDouble* GEsub[SLGEOM_NUMLOADS]; bool computefuture=false; @@ -7555,9 +7494,4 @@ bool percpu=false; bool planethasocean=false; - - Gsub=xNew(SLGEOM_NUMLOADS); - GUsub=xNew(SLGEOM_NUMLOADS); - GEsub=xNew(SLGEOM_NUMLOADS); - GNsub=xNew(SLGEOM_NUMLOADS); this->parameters->FindParam(&nel,MeshNumberofelementsEnum); @@ -7620,7 +7554,5 @@ /*Create geoid: */ - for(int i=0;iAddInput(BedEastGRDEnum,EGrd,P1Enum); } - - /*Free ressources*/ - - xDelete(G); - xDelete(GU); - xDelete(GE); - xDelete(GN); - xDelete(Grot); - xDelete(GSGrot); - xDelete(GUrot); - xDelete(GNrot); - xDelete(GErot); - xDelete(Gsub); - xDelete(GUsub); - xDelete(GEsub); - xDelete(GNsub); } /*}}}*/ @@ -7661,10 +7577,4 @@ int viscousindex=0; //important int viscousnumsteps=1; //important - - IssmDouble* grdfieldinterp=NULL; - IssmDouble* viscoustimes=NULL; - IssmDouble final_time; - IssmDouble lincoeff; - IssmDouble timeacc; this->parameters->FindParam(&computeviscous,SolidearthSettingsViscousEnum); @@ -7751,4 +7661,10 @@ // 3*: subtract from viscous stack the grdfield that has already been accounted for so we don't add it again at the next time step + IssmDouble* grdfieldinterp=NULL; + IssmDouble* viscoustimes=NULL; + IssmDouble final_time; + IssmDouble lincoeff; + IssmDouble timeacc; + this->parameters->FindParam(&viscoustimes,NULL,SealevelchangeViscousTimesEnum); this->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum); @@ -7794,4 +7710,6 @@ } + /*Free allocatoins:*/ + xDelete(viscoustimes); } /*}}}*/ @@ -7809,15 +7727,4 @@ } - - /*Free allocatoins:*/ - xDelete(grdfield); - if (computeviscous){ - xDelete(viscoustimes); - xDelete(viscousfield); - if(computefuture){ - xDelete(grdfieldinterp); - } - } - } /*}}}*/ @@ -7833,5 +7740,4 @@ } /*}}}*/ - #endif Index: /issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp (revision 27060) +++ /issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp (revision 27061) @@ -340,6 +340,4 @@ } - cout << "DEBUG: Sealevelchange convolution cleared\n"; - /*retrieve sea level average and ocean area:*/ for(Object* & object : femmodel->elements->objects){ @@ -347,6 +345,4 @@ element->SealevelchangeOceanAverage(loads, oceanareas, subelementoceanareas, sealevelpercpu, slgeom); } - - cout << "DEBUG: Sealevelchange Oceanavaverage cleared\n"; loads->AssembleSealevelLoads(); @@ -364,6 +360,4 @@ ConserveOceanMass(femmodel,loads,barycontrib->Total()/totaloceanarea - oceanaverage,slgeom); - cout << "DEBUG: Sealevelchange Conserve ocean mass cleared\n"; - //broadcast sea level loads loads->BroadcastSealevelLoads(); @@ -372,5 +366,4 @@ if(slcconvergence(loads->vsealevelloads,oldsealevelloads,eps_rel,eps_abs))break; - cout << "DEBUG: Sealevelchange convergence cleared\n"; //early return? if(iterations>=max_nonlinear_iterations)break; @@ -437,10 +430,4 @@ } - /*Free ressources*/ - delete loads; - delete oldsealevelloads; - delete oceanareas; - delete subelementoceanareas; - } /*}}}*/ @@ -620,9 +607,4 @@ #endif - xDelete(xxe); - xDelete(yye); - xDelete(zze); - xDelete(areae); - return; @@ -690,9 +672,4 @@ femmodel->parameters->AddObject(new DoubleVecParam(ZzeEnum,zze,nel)); femmodel->parameters->AddObject(new DoubleVecParam(AreaeEnum,areae,nel)); - - xDelete(xxe); - xDelete(yye); - xDelete(zze); - xDelete(areae); return slgeom; @@ -887,11 +864,5 @@ xDelete(m2); xDelete(m3); - - xDelete(pmtf_col); - xDelete(pmtf_ortho); - xDelete(pmtf_z); if (viscous){ - xDelete(viscoustimes); - xDelete(viscouspolarmotion); if (computefuture){ xDelete(m1interp); @@ -964,9 +935,8 @@ /*free allocations:*/ xDelete(viscoustimes); - if (rotation) xDelete(viscouspolarmotion); - } - - -} /*}}}*/ + } + + +} void ConserveOceanMass(FemModel* femmodel,GrdLoads* loads, IssmDouble offset, SealevelGeometry* slgeom){ /*{{{*/ @@ -1004,5 +974,4 @@ loadcopy=vloadcopy->ToMPISerial(); - delete vloadcopy; return loadcopy;