aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknarf <knarf@8e189c6b-2ab8-4400-aa02-70a9cfce18b9>2010-08-16 17:52:05 +0000
committerknarf <knarf@8e189c6b-2ab8-4400-aa02-70a9cfce18b9>2010-08-16 17:52:05 +0000
commitfc9e116f3ae7c7c0ad444e0a1d3eb70ef5a918fa (patch)
treed0795b93bd0f86a92fc9582fac0ee7a659f7f7bd
parentf1d8d20ad83173ef94330315aa7dcbd76fb2011b (diff)
actually provide the handle function, change to c for simplicity (from c++)
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEOS/EOS_Omni/EOS_Omni@6 8e189c6b-2ab8-4400-aa02-70a9cfce18b9
-rw-r--r--interface.ccl2
-rw-r--r--src/EOS_Omni_Handles.c (renamed from src/EOS_Omni_Names.cpp)4
-rw-r--r--src/make.code.defn2
3 files changed, 5 insertions, 3 deletions
diff --git a/interface.ccl b/interface.ccl
index 2376137..971f439 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -6,6 +6,8 @@ inherits:
CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name)
+PROVIDES FUNCTION EOS_Omni_GetHandle with EOS_Omni_GetHandle_ LANGUAGE C
+
void FUNCTION EOS_Omni_press(CCTK_INT IN eoskey, \
CCTK_INT IN havetemp, \
CCTK_INT IN npoints, \
diff --git a/src/EOS_Omni_Names.cpp b/src/EOS_Omni_Handles.c
index af910bb..41dbced 100644
--- a/src/EOS_Omni_Names.cpp
+++ b/src/EOS_Omni_Handles.c
@@ -1,9 +1,9 @@
#include <cctk.h>
#include <cctk_Arguments.h>
-#include <cctk_Parameters.h>
-CCTK_INT EOS_Omni_GetHandle(CCTK_STRING name)
+CCTK_INT EOS_Omni_GetHandle_(CCTK_STRING name)
{
+ CCTK_INFO("GetHandle");
if (CCTK_EQUALS(name, "2D_Polytrope"))
return 1;
if (CCTK_EQUALS(name, "Ideal_Fluid"))
diff --git a/src/make.code.defn b/src/make.code.defn
index 55fab54..8bf36e1 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -1,7 +1,7 @@
# Main make.code.defn file for thorn EOS_Omni
# Source files in this directory
-SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 EOS_Omni_Names.cpp
+SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 EOS_Omni_Handles.c
# Subdirectories containing source files
SUBDIRS =