Changeset 26010

Timestamp:

02/20/21 20:50:21 (4 years ago)

Author:

bulthuis

Message:

NEW: add sampling to transient core

Location:

issm/trunk-jpl/src/c

Files:

• analyses/SamplingAnalysis.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (3 diffs)
• cores/transient_core.cpp (modified) (3 diffs)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)

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

@@ -76 +76 @@
   iomodel->FetchDataToInput(inputs,elements,"md.sampling.kappa",SamplingKappaEnum);
         iomodel->FetchDataToInput(inputs,elements,"md.sampling.beta",SamplingBetaEnum,0.);
-        //iomodel->FetchDataToInput(inputs,elements,"md.initialization.sample",SampleEnum,0.);
+        iomodel->FetchDataToInput(inputs,elements,"md.initialization.sample",SampleEnum,0.);
 
 }/*}}}*/

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -853 +853 @@
                 case TransientSolutionEnum:{
                         /*We have multiple analyses here, process one by one*/
-                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslc,isesa,isgia;
+                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslc,isesa,isgia,issampling;
                         iomodel->FindConstant(&isthermal,"md.transient.isthermal");
                         iomodel->FindConstant(&ismovingfront,"md.transient.ismovingfront");
@@ -865 +865 @@
                         iomodel->FindConstant(&isesa,"md.transient.isesa");
                         iomodel->FindConstant(&isgia,"md.transient.isgia");
-         int* analyses_iter     = NULL;
-         int  num_analyses_iter = 0;
+                        iomodel->FindConstant(&issampling,"md.transient.issampling");
+      int* analyses_iter     = NULL;
+      int  num_analyses_iter = 0;
                         if(isstressbalance){
                                 SolutionAnalysesList(&analyses_iter,&num_analyses_iter,iomodel,StressbalanceSolutionEnum);
@@ -911 +912 @@
                         if(isgia){
                                 analyses_temp[numanalyses++]=GiaAnalysisEnum;
+                        }
+                        if(issampling){
+                                analyses_temp[numanalyses++]=SamplingAnalysisEnum;
                         }
 

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -138 +138 @@
 
         /*parameters: */
-        bool isstressbalance,ismasstransport,issmb,isthermal,isgroundingline,isgia,isesa;
+        bool isstressbalance,ismasstransport,issmb,isthermal,isgroundingline,isgia,isesa,issampling;;
         bool isslc,ismovingfront,isdamageevolution,ishydrology,isoceancoupling,save_results;
         int  step,sb_coupling_frequency;
@@ -160 +160 @@
         femmodel->parameters->FindParam(&isdamageevolution,TransientIsdamageevolutionEnum);
         femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum);
+        femmodel->parameters->FindParam(&issampling,TransientIssamplingEnum);
         femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
 
@@ -239 +240 @@
                 if(VerboseSolution()) _printf0_("   computing sea level change\n");
                 sealevelchange_core(femmodel);
+        }
+
+        /*Sampling: */
+        if(issampling){
+                if(VerboseSolution()) _printf0_("   computing Gaussian random field\n");
+                sampling_core(femmodel);
         }
 

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

@@ -86 +86 @@
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.isoceancoupling",TransientIsoceancouplingEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.amr_frequency",TransientAmrFrequencyEnum));
-
+                parameters->AddObject(iomodel->CopyConstantObject("md.transient.issampling",TransientIssamplingEnum));
+                
                 /*For stress balance only*/
                 parameters->AddObject(iomodel->CopyConstantObject("md.flowequation.isFS",FlowequationIsFSEnum));