Changeset 22962

Timestamp:

07/17/18 11:27:18 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving some stuff to analyses

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: */
-        iomodel->FetchData(&nfreq,"md.love.nfreq");
-        parameters->AddObject(new IntParam(LoveNfreqEnum,nfreq));
-
+        /*love numbers: (maybe this should not be in Gia...) */
         iomodel->FetchData(&frequencies,&dummy,&dummy,"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));

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

@@ -26 +26 @@
         /*love numbers: */
         IssmDouble* frequencies = NULL;
-        int         nfreq=0;
         int         dummy;