commit 61353d3a1e907aa5e81a35b8fb7fc49924b7d38d
parent 12b4baed7d0dd73b11b2dc16c84f8b142f56f159
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Fri, 24 Dec 2021 09:49:05 +0100
rename files
Diffstat:
5 files changed, 23 insertions(+), 88 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -126,11 +126,11 @@ set(SDIS_FILES_SRC
stardis-main.c
stardis-output.c
stardis-parsing.c
- stardis-prog.c
+ stardis-fluid-prog.c
stardis-solid.c)
set(SDIS_FILES_INC_API
- stardis-prog-common.h)
+ stardis-prog.h)
set(SDIS_FILES_INC
stardis-app.h
@@ -141,7 +141,7 @@ set(SDIS_FILES_INC
stardis-intface.h
stardis-output.h
stardis-parsing.h
- stardis-prog.h
+ stardis-fluid-prog.h
stardis-solid.h
stardis-version.h.in)
diff --git a/src/stardis-prog.c b/src/stardis-fluid-prog.c
diff --git a/src/stardis-prog.h b/src/stardis-fluid-prog.h
diff --git a/src/stardis-prog-common.h b/src/stardis-prog-common.h
@@ -1,31 +0,0 @@
-
-/* Copyright (C) 2018-2021 |Meso|Star> (contact@meso-star.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef STARDIS_PROG_COMMON_H__
-#define STARDIS_PROG_COMMON_H__
-
-enum stardis_return_codes {
- STARDIS_SUCCESS,
- STARDIS_FAILURE
-};
-
-struct walk_vertex {
- double P[3]; /* World space position */
- double time; /* "Time" of the vertex */
-};
-
-#endif
-
diff --git a/src/stardis-prog.h b/src/stardis-prog.h
@@ -1,65 +1,31 @@
+
/* Copyright (C) 2018-2021 |Meso|Star> (contact@meso-star.com)
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef SDIS_PROG_H
-#define SDIS_PROG_H
-
-#include <sdis.h>
-
-#include <rsys/rsys.h>
-#include <rsys/str.h>
-
-struct stardis;
+#ifndef STARDIS_PROG_COMMON_H__
+#define STARDIS_PROG_COMMON_H__
-/*******************************************************************************
- * Fluid prog data
- ******************************************************************************/
-struct fluid_prog {
- /* This field must come first as a struct fluid_prog* must be usable as
- * an struct custom_data** */
- void* prog_data; /* result of the init_fluid() call */
- struct str name;
- struct str prog_name;
- struct str args;
- int is_outside; /* the fluid is used for a boundary */
- unsigned desc_id; /* id of the boundary; meaningful if is_outside */
- unsigned fluid_id;
- /* lib handle and function ptrs */
- void* lib;
- double (*cp)(const struct sdis_rwalk_vertex*, struct sdis_data*);
- double (*rho)(const struct sdis_rwalk_vertex*, struct sdis_data*);
- double (*temp)(const struct sdis_rwalk_vertex*, struct sdis_data*);
- void* (*create)();
- int (*init)(void*, const char*);
- void (*release)(void*);
+enum stardis_return_codes {
+ STARDIS_SUCCESS,
+ STARDIS_FAILURE
};
-res_T
-create_solver_fluid_prog
- (struct stardis* stardis,
- const struct fluid_prog* fluid_props);
-
-LOCAL_SYM res_T
-init_fluid_prog(struct mem_allocator* allocator, struct fluid_prog** dst);
-
-LOCAL_SYM void
-release_fluid_prog
- (struct fluid_prog* fluid,
- struct mem_allocator* allocator);
-
-LOCAL_SYM res_T
-str_print_fluid_prog(struct str* str, const struct fluid_prog* s);
+struct walk_vertex {
+ double P[3]; /* World space position */
+ double time; /* "Time" of the vertex */
+};
#endif
+
