Changeset 27061 for issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp

Timestamp:

06/14/22 16:18:05 (3 years ago)

Author:

jdquinn

Message:

CHG: Reverting memory management fix

File:

• issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp

@@ -264 +264 @@
 
                         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 +274 @@
                                 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 +595 @@
                                 xDelete<IssmDouble>(G_viscoelastic);
                                 xDelete<IssmDouble>(G_viscoelastic_local);
-                                xDelete<IssmDouble>(G_viscoelastic_interpolated);
                                 xDelete<IssmDouble>(U_viscoelastic);
                                 xDelete<IssmDouble>(U_viscoelastic_local);
-                                xDelete<IssmDouble>(U_viscoelastic_interpolated);
                                 if(horiz){
                                         xDelete<IssmDouble>(H_viscoelastic);
                                         xDelete<IssmDouble>(H_viscoelastic_local);
-                                        xDelete<IssmDouble>(H_viscoelastic_interpolated);
                                 }
                                 if(rotation){
-                                        xDelete<IssmDouble>(Love_th2_interpolated);
-                                        xDelete<IssmDouble>(Love_tk2_interpolated);
-                                        if (horiz) xDelete<IssmDouble>(Love_tl2_interpolated);
                                         xDelete<IssmDouble>(love_pmtf_colinear);
                                         xDelete<IssmDouble>(love_pmtf_ortho);
-                                        xDelete<IssmDouble>(Pmtf_col_interpolated);
-                                        xDelete<IssmDouble>(Pmtf_ortho_interpolated);
-                                        xDelete<IssmDouble>(Pmtf_z_interpolated);
 
                                 }