Changeset 26004

Timestamp:

02/19/21 22:18:58 (4 years ago)

Author:

bulthuis

Message:

NEW: add core sampling_core and solution solver solutionsequence_sampling for sampling capability

Location:

issm/trunk-jpl

Files:

• m4/analyses.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (2 diffs)
• src/c/analyses/EnumToAnalysis.cpp (modified) (1 diff)
• src/c/analyses/SamplingAnalysis.cpp (modified) (1 diff)
• src/c/classes/FemModel.cpp (modified) (3 diffs)
• src/c/classes/Profiler.h (modified) (1 diff)
• src/c/cores/CorePointerFromSolutionEnum.cpp (modified) (2 diffs)
• src/c/cores/cores.h (modified) (2 diffs)
• src/c/cores/sampling_core.cpp (added)
• src/c/shared/Enum/Enum.vim (modified) (1 diff)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)
• src/c/solutionsequences/solutionsequence_sampling.cpp (added)
• src/c/solutionsequences/solutionsequences.h (modified) (2 diffs)
• src/m/solve/solve.m (modified) (2 diffs)

issm/trunk-jpl/m4/analyses.m4

@@ -430 +430 @@
 AC_MSG_RESULT($HAVE_MELTING)
 dnl }}}
+dnl with-Sampling{{{
+
+AC_ARG_WITH([Sampling],
+
+        AS_HELP_STRING([--with-Sampling = YES], [compile with Sampling capabilities (default is yes)]),
+
+        [SAMPLING=$withval],[SAMPLING=yes])
+
+AC_MSG_CHECKING(for Sampling capability compilation)
+
+
+HAVE_SAMPLING=no 
+
+if test "x$SAMPLING" = "xyes"; then
+
+        HAVE_SAMPLING=yes
+
+        AC_DEFINE([_HAVE_SAMPLING_],[1],[with Sampling capability])
+
+fi
+
+AM_CONDITIONAL([SAMPLING], [test x$HAVE_SAMPLING = xyes])
+
+AC_MSG_RESULT($HAVE_SAMPLING)
+
+dnl }}}
 dnl with-Sealevelrise{{{
 AC_ARG_WITH([Sealevelrise],

issm/trunk-jpl/src/c/Makefile.am

@@ -256 +256 @@
         ./solutionsequences/solutionsequence_fct.cpp \
         ./solutionsequences/solutionsequence_schurcg.cpp \
+        ./solutionsequences/solutionsequence_sampling.cpp \
         ./solutionsequences/convergence.cpp \
         ./classes/Options/Options.cpp \
@@ -548 +549 @@
 endif
 #}}}
+#Sampling sources  {{{
+if SAMPLING
+issm_sources += \
+        ./cores/sampling_core.cpp \
+        ./analyses/SamplingAnalysis.cpp
+endif
 #Slr sources  {{{
 if SEALEVELRISE

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

@@ -104 +104 @@
                 case MeltingAnalysisEnum : return new MeltingAnalysis();
                 #endif
+                #ifdef _HAVE_SAMPLING_
+                case SamplingAnalysisEnum : return new SamplingAnalysis();
+                #endif
                 #ifdef _HAVE_SEALEVELRISE_
                 case SealevelchangeAnalysisEnum : return new SealevelchangeAnalysis();

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

@@ -832 +832 @@
                 case EsaSolutionEnum:
                         analyses_temp[numanalyses++]=EsaAnalysisEnum;
+                        break;
+
+                case SamplingSolutionEnum:
+                        analyses_temp[numanalyses++]=SamplingAnalysisEnum;
                         break;
 
@@ -4828 +4832 @@
         IssmDouble* bslcice_partition_serial=NULL;
         IssmDouble* partitionice=NULL;
-        int npartice,nel; 
+        int npartice,nel;
 
         Vector<IssmDouble>* bslchydro_partition=NULL;
         IssmDouble* bslchydro_partition_serial=NULL;
         IssmDouble* partitionhydro=NULL;
-        int nparthydro; 
-                
+        int nparthydro;
+
 
    /*Initialize temporary vector that will be used to sum barystatic components
@@ -5105 +5109 @@
         pUp->SetValues(gsize,indices,Up,ADD_VAL);
         pUp->Assemble();
-        
+
 
         /*Add RSL to Up to find the geoid: */

issm/trunk-jpl/src/c/classes/Profiler.h

@@ -27 +27 @@
 #define ESACORE                         14 /*Profiling ESA */
 #define SLRCORE                         15 /*Profiling SLR */
-#define MPISERIAL                               16 /*Profiling MPISerial */
-#define SEDLOOP                         17 /*Profiling MPISerial */
-#define SEDMatrix                               18 /*Profiling MPISerial */
-#define SEDUpdate                               19 /*Profiling MPISerial */
-#define EPLLOOP                         20 /*Profiling MPISerial */
-#define EPLMasking                      21 /*Profiling MPISerial */
-#define EPLMatrices                     22 /*Profiling MPISerial */
-#define EPLUpdate                               23 /*Profiling MPISerial */
-#define MAXPROFSIZE                     24 /*Used to initialize static arrays*/
+#define SAMPLINGCORE    16 /*Profiling SAMPLING */
+#define MPISERIAL                               17 /*Profiling MPISerial */
+#define SEDLOOP                         18 /*Profiling MPISerial */
+#define SEDMatrix                               19 /*Profiling MPISerial */
+#define SEDUpdate                               20 /*Profiling MPISerial */
+#define EPLLOOP                         21 /*Profiling MPISerial */
+#define EPLMasking                      22 /*Profiling MPISerial */
+#define EPLMatrices                     23 /*Profiling MPISerial */
+#define EPLUpdate                               24 /*Profiling MPISerial */
+#define MAXPROFSIZE                     25 /*Used to initialize static arrays*/
 
 

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

@@ -1 +1 @@
 /*!\file:  CorePointerFromSolutionEnum.cpp
  * \brief: return type of analyses, number of analyses and core solution function.
- */ 
+ */
 
 #ifdef HAVE_CONFIG_H
@@ -82 +82 @@
                         #endif
                         break;
+                case SamplingSolutionEnum:
+                        solutioncore=&sampling_core;
+                        break;
 
                 default:

issm/trunk-jpl/src/c/cores/cores.h

@@ -1 +1 @@
 /*
- * cores.h: 
+ * cores.h:
  */
 
@@ -54 +54 @@
 void bmb_core(FemModel* femmodel);
 void damage_core(FemModel* femmodel);
+void sampling_core(FemModel* femmodel);
 
 /*sealevel change cores:*/

issm/trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -1307 +1307 @@
 syn keyword cConstant RecoveryAnalysisEnum
 syn keyword cConstant RiftfrontEnum
+syn keyword cConstant SamplingAnalysisEnum
+syn keyword cConstant SamplingSolutionEnum
 syn keyword cConstant SIAApproximationEnum
 syn keyword cConstant SMBcomponentsEnum

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -1306 +1306 @@
         RecoveryAnalysisEnum,
         RiftfrontEnum,
+        SamplingAnalysisEnum,
+        SamplingSolutionEnum,
         SIAApproximationEnum,
         SMBcomponentsEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -1309 +1309 @@
                 case RecoveryAnalysisEnum : return "RecoveryAnalysis";
                 case RiftfrontEnum : return "Riftfront";
+                case SamplingAnalysisEnum : return "SamplingAnalysis";
+                case SamplingSolutionEnum : return "SamplingSolution";
                 case SIAApproximationEnum : return "SIAApproximation";
                 case SMBcomponentsEnum : return "SMBcomponents";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -1339 +1339 @@
               else if (strcmp(name,"RecoveryAnalysis")==0) return RecoveryAnalysisEnum;
               else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
+              else if (strcmp(name,"SamplingAnalysis")==0) return SamplingAnalysisEnum;
+              else if (strcmp(name,"SamplingSolution")==0) return SamplingSolutionEnum;
               else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
               else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
@@ -1365 +1367 @@
               else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum;
               else if (strcmp(name,"SealevelchangeAnalysis")==0) return SealevelchangeAnalysisEnum;
-              else if (strcmp(name,"SealevelchangeSolution")==0) return SealevelchangeSolutionEnum;
-              else if (strcmp(name,"Seg")==0) return SegEnum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"SegInput")==0) return SegInputEnum;
+              if (strcmp(name,"SealevelchangeSolution")==0) return SealevelchangeSolutionEnum;
+              else if (strcmp(name,"Seg")==0) return SegEnum;
+              else if (strcmp(name,"SegInput")==0) return SegInputEnum;
               else if (strcmp(name,"Segment")==0) return SegmentEnum;
               else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;

issm/trunk-jpl/src/c/solutionsequences/solutionsequences.h

@@ -1 +1 @@
 /*
- * solutionsequences.h: 
+ * solutionsequences.h:
  */
 
@@ -25 +25 @@
 void solutionsequence_adjoint_linear(FemModel* femmodel);
 void solutionsequence_schurcg(FemModel* femmodel);
+void solutionsequence_sampling(FemModel* femmodel);
 
 /*convergence*/

issm/trunk-jpl/src/m/solve/solve.m

@@ -23 +23 @@
 %   - 'Esa'                or 'esa'
 %   - 'Sealevelchange'     or 'slc'
+%   - 'Sampling'           or 'smp'
 %
 %   Extra options:
@@ -75 +76 @@
 elseif strcmpi(solutionstring,'slc') || strcmpi(solutionstring,'Sealevelchange')
         solutionstring = 'SealevelchangeSolution';
+elseif strcmpi(solutionstring,'smp') || strcmpi(solutionstring,'Sampling')
+        solutionstring = 'SamplingSolution';    
 else
         error(['solutionstring ' solutionstring ' not supported!']);