Changeset 27347 for issm/trunk/src/c/analyses/LoveAnalysis.cpp

Timestamp:

10/27/22 11:39:37 (2 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27344

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/analyses/LoveAnalysis.cpp (modified) (3 diffs)

issm/trunk/src/c/analyses/LoveAnalysis.cpp

@@ -20 +20 @@
 void LoveAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
         IssmDouble* frequencies = NULL;
-        int         nfreq;
+        IssmDouble* hypergeom_z = NULL;
+        IssmDouble* hypergeom_table1 = NULL;
+        IssmDouble* hypergeom_table2 = NULL;
+        int         nfreq,nz, nalpha;
         iomodel->FetchData(&nfreq,"md.love.nfreq");
+        iomodel->FetchData(&nz,"md.love.hypergeom_nz");
+        iomodel->FetchData(&nalpha,"md.love.hypergeom_nalpha");
         iomodel->FetchData(&frequencies,NULL,NULL,"md.love.frequencies");
+        iomodel->FetchData(&hypergeom_z,NULL,NULL,"md.love.hypergeom_z");
+        iomodel->FetchData(&hypergeom_table1,NULL,NULL,"md.love.hypergeom_table1");
+        iomodel->FetchData(&hypergeom_table2,NULL,NULL,"md.love.hypergeom_table2");
+
         parameters->AddObject(new DoubleVecParam(LoveFrequenciesEnum,frequencies,nfreq));
+        parameters->AddObject(new DoubleVecParam(LoveHypergeomZEnum,hypergeom_z,nz));
+        parameters->AddObject(new DoubleMatParam(LoveHypergeomTable1Enum,hypergeom_table1,nz,nalpha));
+        parameters->AddObject(new DoubleMatParam(LoveHypergeomTable2Enum,hypergeom_table2,nz,nalpha));
+
         xDelete<IssmDouble>(frequencies);
+        xDelete<IssmDouble>(hypergeom_z);
+        xDelete<IssmDouble>(hypergeom_table1);
+        xDelete<IssmDouble>(hypergeom_table2);
 
         parameters->AddObject(iomodel->CopyConstantObject("md.love.nfreq",LoveNfreqEnum));
@@ -37 +53 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.love.underflow_tol",LoveUnderflowTolEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.love.pw_threshold",LovePostWidderThresholdEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.love.integration_steps_per_layer",LoveIntStepsPerLayerEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.min_integration_steps",LoveMinIntegrationStepsEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.max_integration_dr",LoveMaxIntegrationdrEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.integration_scheme",LoveIntegrationSchemeEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.love.istemporal",LoveIsTemporalEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.love.n_temporal_iterations",LoveNTemporalIterationsEnum));
@@ -45 +63 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.love.core_mantle_boundary",LoveCoreMantleBoundaryEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.love.complex_computation",LoveComplexComputationEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.quad_precision",LoveQuadPrecisionEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.debug",LoveDebugEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.rotational.equatorialmoi",RotationalEquatorialMoiEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.rotational.polarmoi",RotationalPolarMoiEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.rotational.angularvelocity",RotationalAngularVelocityEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.lovenumbers.tk2secular",TidalLoveK2SecularEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.hypergeom_nz",LoveHypergeomNZEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.hypergeom_nalpha",LoveHypergeomNAlphaEnum));
 }/*}}}*/
 void LoveAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/