Changeset 23601

Timestamp:

01/05/19 20:18:05 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving some params to analysis

Location:

issm/trunk-jpl/src/c

Files:

• analyses/LoveAnalysis.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)

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

@@ -19 +19 @@
 }/*}}}*/
 void LoveAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
+
+        IssmDouble* frequencies = NULL;
+        int         nfreq;
+        iomodel->FetchData(&nfreq,"md.love.nfreq");
+        iomodel->FetchData(&frequencies,NULL,NULL,"md.love.frequencies");
+        parameters->AddObject(new DoubleVecParam(LoveFrequenciesEnum,frequencies,nfreq));
+        xDelete<IssmDouble>(frequencies);
+
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.nfreq",LoveNfreqEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.sh_nmax",LoveShNmaxEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.sh_nmin",LoveShNminEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.g0",LoveG0Enum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.r0",LoveR0Enum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.mu0",LoveMu0Enum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.allow_layer_deletion",LoveAllowLayerDeletionEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.love_kernels",LoveKernelsEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.love.forcing_type",LoveForcingTypeEnum));
 }/*}}}*/
 void LoveAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -345 +345 @@
         /*}}}*/
 
-        /*Fourier love parameters (FIXME: should be in an analysis...*/
-        if(solution_type==LoveSolutionEnum){
-                IssmDouble* frequencies = NULL;
-                int         nfreq;
-                iomodel->FetchData(&nfreq,"md.love.nfreq");
-                iomodel->FetchData(&frequencies,NULL,NULL,"md.love.frequencies");
-                parameters->AddObject(new DoubleVecParam(LoveFrequenciesEnum,frequencies,nfreq));
-                xDelete<IssmDouble>(frequencies);
-
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.nfreq",LoveNfreqEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.sh_nmax",LoveShNmaxEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.sh_nmin",LoveShNminEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.g0",LoveG0Enum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.r0",LoveR0Enum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.mu0",LoveMu0Enum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.allow_layer_deletion",LoveAllowLayerDeletionEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.love_kernels",LoveKernelsEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.love.forcing_type",LoveForcingTypeEnum));
-        }
-
         /*Before returning, create parameters in case we are running Qmu or control types runs: */
         CreateParametersControl(parameters,iomodel,solution_type);
@@ -379 +359 @@
         CreateParametersAutodiff(parameters,iomodel);
         if(VerboseMProcessor()) _printf0_("   ending autodiff parameters \n");
-
         #endif
 }