Changeset 22969

Timestamp:

07/17/18 13:30:24 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing love parameters that have to be in general modules/ModelProcessorx/CreateParameters.cpp, we might want to have an analysis instead

Location:

issm/trunk-jpl/src/c

Files:

• analyses/GiaIvinsAnalysis.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)

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

@@ -39 +39 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum));
 
-        /*love numbers: (maybe this should not be in Gia...) */
-        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));
-
 }/*}}}*/
 

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

@@ -343 +343 @@
         /*}}}*/
 
+        /*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);