Changeset 26744 for issm/trunk/src/c/classes/Params/TransientParam.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/classes/Params/TransientParam.h (modified) (2 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/classes/Params/TransientParam.h

@@ -24 +24 @@
                 int         N;
                 bool        interpolation;
+                bool        cycle;
                 IssmDouble *values;
                 IssmDouble *timesteps;
@@ -30 +31 @@
                 /*TransientParam constructors, destructors: {{{*/
                 TransientParam();
-                TransientParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,bool interpolation_on,int in_N);
+                TransientParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,bool interpolation_in,bool cycle_in,int in_N);
                 ~TransientParam();
                 /*}}}*/

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