update fortran ifc-files wrt changes h-files

gismo · Jun 12, 2024 · c2edb5c · c2edb5c
1 parent 926888b
commit c2edb5c
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 22 deletions.
diff --git a/src/gismo.ifc b/src/gismo.ifc
@@ -64,15 +64,15 @@
 
    interface
 
-#include <gsCInterface/gsCMatrix.ifc>
-#include <gsCInterface/gsCMatrixInt.ifc>
-#include <gsCInterface/gsCVector.ifc>
-#include <gsCInterface/gsCVectorInt.ifc>
-#include <gsCInterface/gsCKnotVector.ifc>
-#include <gsCInterface/gsCFunctionSet.ifc>
-#include <gsCInterface/gsCMultiPatch.ifc>
-#include <gsCInterface/gsCBasis.ifc>
-#include <gsCInterface/gsCGeometry.ifc>
-#include <gsCInterface/gsCReadFile.ifc>
+#     include <gsCInterface/gsCMatrix.ifc>
+#     include <gsCInterface/gsCMatrixInt.ifc>
+#     include <gsCInterface/gsCVector.ifc>
+#     include <gsCInterface/gsCVectorInt.ifc>
+#     include <gsCInterface/gsCKnotVector.ifc>
+#     include <gsCInterface/gsCFunctionSet.ifc>
+#     include <gsCInterface/gsCMultiPatch.ifc>
+#     include <gsCInterface/gsCBasis.ifc>
+#     include <gsCInterface/gsCGeometry.ifc>
+#     include <gsCInterface/gsCReadFile.ifc>
 
    end interface
diff --git a/src/gsCBasis.ifc b/src/gsCBasis.ifc
@@ -14,13 +14,43 @@
 !     GISMO_EXPORT gsCBasis* THBSplineBasis3_create(gsCBasis* basis);
 !     GISMO_EXPORT gsCBasis* THBSplineBasis4_create(gsCBasis* basis);
 
+!     GISMO_EXPORT gsCBasis* gsHBSplineBasis1_create(gsCBasis* basis);
+!     GISMO_EXPORT gsCBasis* gsHBSplineBasis2_create(gsCBasis* basis);
+!     GISMO_EXPORT gsCBasis* gsHBSplineBasis3_create(gsCBasis* basis);
+!     GISMO_EXPORT gsCBasis* gsHBSplineBasis4_create(gsCBasis* basis);
+
+!     Methods, gsBasis
+
 !     GISMO_EXPORT void gsBasis_active_into(gsCBasis * b, gsCMatrix * u, gsCMatrixInt * result);
 
+!     GISMO_EXPORT void gsBasis_evalSingle_into(gsCBasis * b, int i, gsCMatrix * u, gsCMatrix * result);
+!     GISMO_EXPORT void gsBasis_derivSingle_into(gsCBasis * b, int i, gsCMatrix * u, gsCMatrix * result);
+!     GISMO_EXPORT void gsBasis_deriv2Single_into(gsCBasis * b, int i, gsCMatrix * u, gsCMatrix * result);
+
 !     GISMO_EXPORT gsCBasis * gsBasis_component(gsCBasis * b, int dir);
 !     GISMO_EXPORT int gsBasis_degree(gsCBasis * b, int dir);
 !     GISMO_EXPORT int gsBasis_numElements(gsCBasis * b);
+!     GISMO_EXPORT int gsBasis_dim(gsCBasis * b);
 !     GISMO_EXPORT int gsBasis_size(gsCBasis * b);
+!     GISMO_EXPORT gsCMatrix* gsBasis_support(gsCBasis * b, int i);
 !     
 !     GISMO_EXPORT void gsBasis_uniformRefine(gsCBasis * b, int numKnots, int mul, int dir);
 !     GISMO_EXPORT void gsBasis_refineElements(gsCBasis * b, int * boxData, int boxSize);
+!     GISMO_EXPORT void gsBasis_refine(gsCBasis * b, gsCMatrix * boxes, int refExt);
+
+!     TODO:
+!     - DegreeElevate
+
+!     Methods, Other
+
+!     GISMO_EXPORT gsCKnotVector * gsBSplineBasis_knots(gsCBasis * b);
+!     GISMO_EXPORT gsCKnotVector * gsTensorBSplineBasis_knots(gsCBasis * b, int dir);
+
+!     GISMO_EXPORT int gsHTensorBasis_numLevels(gsCBasis * b);
+!     GISMO_EXPORT int gsHTensorBasis_maxLevel(gsCBasis * b);
+!     GISMO_EXPORT int gsHTensorBasis_levelOf(gsCBasis * b, int i);
+!     GISMO_EXPORT int gsHTensorBasis_getLevelAtPoint(gsCBasis * b, gsCMatrix * Pt);
+!     GISMO_EXPORT gsCBasis * gsHTensorBasis_tensorLevel(gsCBasis * b, int l);
+!     GISMO_EXPORT void gsHTensorBasis_treeLeafSize(gsCBasis * b);
+!     GISMO_EXPORT void gsHTensorBasis_treePrintLeaves(gsCBasis * b);
 !------------------------------------------------------------------------------------------------------------
diff --git a/src/gsCFunctionSet.ifc b/src/gsCFunctionSet.ifc
@@ -1,4 +1,9 @@
 
+
+#ifdef __cplusplus
+}
+#endif
+
 !------------------------------------------------------------------------------------------------------------
 !     GISMO_EXPORT void gsFunctionSet_delete(gsCFunctionSet * ptr);
 
@@ -40,7 +45,7 @@
 !     GISMO_EXPORT int gsFunctionSet_targetDim(gsCFunctionSet * fs);
 
 !------------------------------------------------------------------------------------------------------------
-!     GISMO_EXPORT gsCBasis * gsFunctionSet_basis(gsCFunctionSet * fs, int i);
+!     GISMO_EXPORT gsCMatrix* gsFunctionSet_support(gsCFunctionSet * fs);
 
 !------------------------------------------------------------------------------------------------------------
 !     GISMO_EXPORT void gsFunctionSet_eval_into(gsCFunctionSet * fs,
@@ -64,8 +69,3 @@
 !                                                gsCMatrix * result);
 
 !------------------------------------------------------------------------------------------------------------
-!     GISMO_EXPORT void gsFunctionSet_normal_into(gsCFunctionSet * fs,
-!                                                 gsCMatrix * u,
-!                                                 gsCMatrix * result);
-
-!------------------------------------------------------------------------------------------------------------
diff --git a/src/gsCGeometry.ifc b/src/gsCGeometry.ifc
@@ -28,6 +28,18 @@
 !------------------------------------------------------------------------------------------------------------
 !     GISMO_EXPORT gsCGeometry* gsTHBSpline4_create(gsCBasis* b, gsCMatrix * coef);
 
+!------------------------------------------------------------------------------------------------------------
+!     GISMO_EXPORT gsCGeometry* gsHBSpline1_create(gsCBasis* b, gsCMatrix * coef);
+
+!------------------------------------------------------------------------------------------------------------
+!     GISMO_EXPORT gsCGeometry* gsHBSpline2_create(gsCBasis* b, gsCMatrix * coef);
+
+!------------------------------------------------------------------------------------------------------------
+!     GISMO_EXPORT gsCGeometry* gsHBSpline3_create(gsCBasis* b, gsCMatrix * coef);
+
+!------------------------------------------------------------------------------------------------------------
+!     GISMO_EXPORT gsCGeometry* gsHBSpline4_create(gsCBasis* b, gsCMatrix * coef);
+
 !------------------------------------------------------------------------------------------------------------
 !     GISMO_EXPORT gsCBasis* gsGeometry_basis(gsCGeometry * g);
 

diff --git a/src/gsCMultiPatch.ifc b/src/gsCMultiPatch.ifc
@@ -13,8 +13,4 @@
 !     GISMO_EXPORT void gsFunctionSet_deriv_into(gsCFunctionSet * fs,
 !                                                gsCMatrix * u,
 !                                                gsCMatrix * result);
-
-!     GISMO_EXPORT void gsFunctionSet_normal_into(gsCFunctionSet * fs,
-!                                                 gsCMatrix * u,
-!                                                 gsCMatrix * result);
 !------------------------------------------------------------------------------------------------------------
diff --git a/src/gsCVector.ifc b/src/gsCVector.ifc
@@ -1,8 +1,8 @@
 
 !------------------------------------------------------------------------------------------------------------
 !     GISMO_EXPORT gsCVector * gsVector_create(void);
-!     GISMO_EXPORT gsCVector * gsVector_create_r (int rows, int cols);
-!     GISMO_EXPORT gsCVector * gsVector_create_rd(int rows, int cols, double * data);
+!     GISMO_EXPORT gsCVector * gsVector_create_r (int rows);
+!     GISMO_EXPORT gsCVector * gsVector_create_rd(int rows, double * data);
 !     GISMO_EXPORT void gsVector_delete(gsCVector * m);
 !     GISMO_EXPORT void gsVector_print(gsCVector * m);
 !     GISMO_EXPORT double * gsVector_data(gsCVector * m);