Changeset 22961

Timestamp:

07/17/18 11:25:21 (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)
• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)

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

@@ -36 +36 @@
 }/*}}}*/
 void GiaIvinsAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
+
+        parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum));
+
+        /*love numbers: */
+        iomodel->FetchData(&nfreq,"md.love.nfreq");
+        parameters->AddObject(new IntParam(LoveNfreqEnum,nfreq));
+
+        iomodel->FetchData(&frequencies,&dummy,&dummy,"md.love.frequencies");
+        parameters->AddObject(new DoubleVecParam(LoveFrequenciesEnum,frequencies,nfreq));
+        xDelete<IssmDouble>(frequencies);
+
+        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/analyses/SealevelriseAnalysis.cpp

@@ -99 +99 @@
 
         /*some constant parameters: */
+        parameters->AddObject(iomodel->CopyConstantObject("md.slr.geodetic_run_frequency",SealevelriseGeodeticRunFrequencyEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.slr.reltol",SealevelriseReltolEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.slr.abstol",SealevelriseAbstolEnum));

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

@@ -66 +66 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.inversion.type",InversionTypeEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.calving.law",CalvingLawEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.slr.geodetic_run_frequency",SealevelriseGeodeticRunFrequencyEnum));
         parameters->AddObject(new IntParam(SealevelriseRunCountEnum,1));  
         
-        /*gia: */
-        parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum));
-        
-        /*love numbers: */
-        iomodel->FetchData(&nfreq,"md.love.nfreq");
-        parameters->AddObject(new IntParam(LoveNfreqEnum,nfreq));
-
-        iomodel->FetchData(&frequencies,&dummy,&dummy,"md.love.frequencies");
-        parameters->AddObject(new DoubleVecParam(LoveFrequenciesEnum,frequencies,nfreq));
-        xDelete<IssmDouble>(frequencies);
-        
-        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));
 
           {/*This is specific to ice...*/
@@ -108 +88 @@
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.isoceancoupling",TransientIsoceancouplingEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.amr_frequency",TransientAmrFrequencyEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum));
 
                 /*For stress balance only*/