Changeset 25836 for issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h (modified) (2 diffs)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h

@@ -1 +1 @@
 /*!\file:  GetVectorFromInputsx.h
- */ 
+ */
 
 #ifndef _GETVECTORFROMINPUTSXX_H
@@ -8 +8 @@
 
 /* local prototypes: */
-void    GetVectorFromInputsx( Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type);
-void    GetVectorFromInputsx( IssmDouble** pvector,FemModel* femmodel,int name,int type);
+void    GetVectorFromInputsx(Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type);
+void    GetVectoronBaseFromInputsx(Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type);
+void  GetVectorFromInputsx(Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type,IssmDouble time);
+void    GetVectorFromInputsx(IssmDouble** pvector,FemModel* femmodel,int name,int type);
+void    GetVectoronBaseFromInputsx(IssmDouble** pvector,FemModel* femmodel,int name,int type);
 void  GetVectorFromInputsx(IssmDouble** pvector,int* pvector_size, FemModel* femmodel,int name);
-void GetVectorFromInputsx(Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type,IssmDouble time);
+
 
 #endif  /* _GETVECTORFROMINPUTSXX_H */

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post