[Commits] [svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 6)

[knarf at cct.lsu.edu]

User: knarf
Date: 2010/08/16 12:52 PM

Added:
 /EOS_Omni/src/
  EOS_Omni_Handles.c

Removed:
 /EOS_Omni/src/
  EOS_Omni_Names.cpp

Modified:
 /EOS_Omni/
  interface.ccl
 /EOS_Omni/src/
  make.code.defn

Log:
 actually provide the handle function, change to c for simplicity (from c++)

File Changes:

Directory: /EOS_Omni/
=====================

File [modified]: interface.ccl
Delta lines: +2 -0
===================================================================
--- EOS_Omni/interface.ccl	2010-08-16 14:12:22 UTC (rev 5)
+++ EOS_Omni/interface.ccl	2010-08-16 17:52:05 UTC (rev 6)
@@ -6,6 +6,8 @@
 
 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,        \

Directory: /EOS_Omni/src/
=========================

File [added]: EOS_Omni_Handles.c
Delta lines: +15 -0
===================================================================
--- EOS_Omni/src/EOS_Omni_Handles.c	                        (rev 0)
+++ EOS_Omni/src/EOS_Omni_Handles.c	2010-08-16 17:52:05 UTC (rev 6)
@@ -0,0 +1,15 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+
+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"))
+        return 2;
+    if (CCTK_EQUALS(name, "Hybrid"))
+        return 3;
+    return 0;
+}
+

File [removed]: EOS_Omni_Names.cpp
Delta lines: +0 -15
===================================================================
--- EOS_Omni/src/EOS_Omni_Names.cpp	2010-08-16 14:12:22 UTC (rev 5)
+++ EOS_Omni/src/EOS_Omni_Names.cpp	2010-08-16 17:52:05 UTC (rev 6)
@@ -1,15 +0,0 @@
-#include <cctk.h>
-#include <cctk_Arguments.h>
-#include <cctk_Parameters.h>
-
-CCTK_INT EOS_Omni_GetHandle(CCTK_STRING name)
-{
-    if (CCTK_EQUALS(name, "2D_Polytrope"))
-        return 1;
-    if (CCTK_EQUALS(name, "Ideal_Fluid"))
-        return 2;
-    if (CCTK_EQUALS(name, "Hybrid"))
-        return 3;
-    return 0;
-}
-

File [modified]: make.code.defn
Delta lines: +1 -1
===================================================================
--- EOS_Omni/src/make.code.defn	2010-08-16 14:12:22 UTC (rev 5)
+++ EOS_Omni/src/make.code.defn	2010-08-16 17:52:05 UTC (rev 6)
@@ -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 =