Changeset 26744 for issm/trunk/src/c/analyses/analyses.h

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/analyses/analyses.h (modified) (4 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean

issm/trunk/src/c/analyses/analyses.h

@@ -1 +1 @@
 /*
- * analyses.h: 
+ * analyses.h:
  */
 
@@ -23 +23 @@
 #include "./FreeSurfaceBaseAnalysis.h"
 #include "./FreeSurfaceTopAnalysis.h"
-#include "./GiaAnalysis.h"
 #include "./GLheightadvectionAnalysis.h"
 #include "./LoveAnalysis.h"
@@ -30 +29 @@
 #include "./HydrologyDCInefficientAnalysis.h"
 #include "./HydrologyShreveAnalysis.h"
+#include "./HydrologyTwsAnalysis.h"
 #include "./HydrologyGlaDSAnalysis.h"
 #include "./HydrologyShaktiAnalysis.h"
@@ -35 +35 @@
 #include "./LevelsetAnalysis.h"
 #include "./MasstransportAnalysis.h"
+#include "./OceantransportAnalysis.h"
+#include "./SamplingAnalysis.h"
 #include "./SmbAnalysis.h"
-#include "./SealevelriseAnalysis.h"
+#include "./SealevelchangeAnalysis.h"
 #include "./MeltingAnalysis.h"
 #include "./SmoothAnalysis.h"

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean