Changeset 83 for trunk/src/fortran

Timestamp:

Oct 5, 2005, 8:17:26 AM (19 years ago)

Author:

dkearney

Message:

1. More cleaning of RpUnits and RpLibrary? code
2. added rp_result code to c++/fortran/c code
3. added rp_children, rp_lib_node[comp,type,id] for fortran code (need to test)
4. adjusted convert function to recognize statements as follows:

convert("5J","neV")
convert("3.12075e+28neV","J")

5. made joules a metric unit in RpUnits.cc
6. tested examples/app-fermi/fortran/fermi.f with new rappture library.

added units conversion.

Location:

trunk/src/fortran

Files:

• RpFortranCommon.c (modified) (1 diff)
• RpLibraryFInterface.cc (modified) (24 diffs)
• RpUnitsFInterface.cc (modified) (1 diff)

trunk/src/fortran/RpFortranCommon.c

@@ +1 @@
+/*
+ * ----------------------------------------------------------------------
+ *  INTERFACE: Fortran Rappture Common Functions Source
+ *
+ *    Fortran functions common to all interfaces.
+ *
+ * ======================================================================
+ *  AUTHOR:  Derrick Kearney, Purdue University
+ *  Copyright (c) 2005
+ *  Purdue Research Foundation, West Lafayette, IN
+ * ======================================================================
+ */
+
+
 #include "RpFortranCommon.h"
 

trunk/src/fortran/RpLibraryFInterface.cc

@@ +1 @@
+/*
+ * ----------------------------------------------------------------------
+ *  INTERFACE: Fortran Rappture Library Source
+ *
+ * ======================================================================
+ *  AUTHOR:  Derrick Kearney, Purdue University
+ *  Copyright (c) 2005
+ *  Purdue Research Foundation, West Lafayette, IN
+ * ======================================================================
+ */
+
 #include "RpLibraryFInterface.h"
 
@@ -8 +19 @@
 
     inFilePath = null_terminate_str(filePath, filePath_len);
-    
+
     // create a RapptureIO object and store in dictionary
     lib = new RpLibrary(inFilePath);
@@ -37 +48 @@
         if (lib) {
             retObj = lib->element(inPath);
-            
+
             if (retObj) {
                 newObjHandle = storeObject_Lib(retObj);
@@ -68 +79 @@
         }
     }
-    
+
 }
 
@@ -95 +106 @@
 
 void rp_lib_element_type( int* handle, /* integer handle of library */
-                            char* path,      /* null terminated path */
+                            char* path,      /* search path inside xml */
                             char* retText,   /* return buffer for fortran*/
                             int path_len,
@@ -113 +124 @@
         fortranify(retStr.c_str(),retText,retText_len);
     }
+}
+
+int rp_lib_children (   int* handle, /* integer handle of library */
+                        char* path, /* search path of the xml */
+                        int* childHandle, /*integer hanlde of last returned child*/
+                        int path_len  /* length of the search path buffer */
+                    ) {
+
+    std::string inPath = "";
+    RpLibrary* lib = NULL;
+    RpLibrary* childNode = NULL;
+    int newObjHandle = -1;
+
+    inPath = null_terminate_str(path,path_len);
+
+    if (handle && (*handle >= 0) ) {
+        lib = getObject_Lib(*handle);
+        if (lib) {
+            if (*childHandle < 1) {
+                // check to see if there were any previously returned children
+                childNode = getObject_Lib(*childHandle);
+            }
+
+            // call the children base method
+            childNode = lib->children(path,childNode);
+
+            // store the childNode in the dictionary.
+            //
+            // because the base method is using static memory to get store the
+            // children we should be able to chekc and see if the childHandle 
+            // was valud.
+            // if so, then we can just return the childHandle back to the user
+            // if not, store the object in the dictionary and return the new
+            // handle.
+
+            if (childNode) {
+                if (*childHandle < 1) {
+                    newObjHandle = storeObject_Lib(childNode);
+                }
+                else {
+                    newObjHandle = *childHandle;
+                }
+            }
+        }
+    }
+
+    return newObjHandle;
+
 }
 
@@ -128 +187 @@
 
     inPath = null_terminate(path,path_len);
-    
+
     if (rapptureStarted) {
         if ((handle) && (*handle != 0)) {
@@ -140 +199 @@
                 }
                 else {
-                    
+
                 }
             }
@@ -394 +453 @@
 
     RpLibrary* lib = NULL;
-    
+
     std::string inPath = "";
 
@@ -401 +460 @@
     if ((handle) && (*handle != 0)) {
         lib = getObject_Lib(*handle);
-        
+
         if (lib) {
             xmlText = lib->getString(inPath);
@@ -420 +479 @@
 
     RpLibrary* lib = NULL;
-    
+
     std::string inPath = "";
 
@@ -427 +486 @@
     if ((handle) && (*handle != 0)) {
         lib = getObject_Lib(*handle);
-        
+
         if (lib) {
             retVal = lib->getDouble(inPath);
@@ -443 +502 @@
                         int path_len,
                         int value_len
-                      ) 
+                      )
 {
     std::string inPath = "";
@@ -459 +518 @@
         }
     }
-    
+
     return;
-    
+
 }
 
@@ -476 +535 @@
 {
     RpLibrary* lib = NULL;
-    
+
     std::string inPath = "";
     std::string inValue = "";
@@ -487 +546 @@
     if ((handle) && (*handle != 0)) {
         lib = getObject_Lib(*handle);
-        
+
         if (lib) {
             lib->put(inPath,inValue,inId,*append);
@@ -586 +645 @@
     PyObject* lib = NULL;
     PyObject* removedObj = NULL;
-    
+
     char* inPath = NULL;
 
@@ -597 +656 @@
             if (lib) {
                 removedObj = rpRemove(lib, inPath);
-                
+
                 if (removedObj) {
                     newObjHandle = storeObject_Lib(removedObj);
@@ -606 +665 @@
         }
     }
-    
+
     if (inPath) {
         free(inPath);
@@ -643 +702 @@
 }
 */
-
-void  rp_lib_xml(int* handle, char* retText, int retText_len)
-{
-    std::string xmlText = "";
-
-    RpLibrary* lib = NULL;
-    
-    if ((handle) && (*handle != 0)) {
-        lib = getObject_Lib(*handle);
-
-        if (lib) {
-            xmlText = lib->xml();
-            if (!xmlText.empty()) {
-                fortranify(xmlText.c_str(), retText, retText_len);
-            }
-        }
-    }
-}
 
 int rp_lib_write_xml(int* handle, char* outFile, int outFile_len)
@@ -695 +736 @@
 }
 
+void  rp_lib_xml(int* handle, char* retText, int retText_len)
+{
+    std::string xmlText = "";
+
+    RpLibrary* lib = NULL;
+
+    if ((handle) && (*handle != 0)) {
+        lib = getObject_Lib(*handle);
+
+        if (lib) {
+            xmlText = lib->xml();
+            if (!xmlText.empty()) {
+                fortranify(xmlText.c_str(), retText, retText_len);
+            }
+        }
+    }
+}
+
+void rp_lib_node_comp ( int* handle, char* retText, int retText_len ) {
+
+    std::string retStr = "";
+    RpLibrary* node = NULL;
+
+    if ((handle) && (*handle != 0)) {
+        node = getObject_Lib(*handle);
+
+        if (node) {
+            retStr = node->nodeComp();
+            if (!retStr.empty()) {
+                fortranify(retStr.c_str(), retText, retText_len);
+            }
+        }
+    }
+}
+
+void rp_lib_node_type ( int* handle, char* retText, int retText_len ) {
+
+    std::string retStr = "";
+    RpLibrary* node = NULL;
+
+    if ((handle) && (*handle != 0)) {
+        node = getObject_Lib(*handle);
+
+        if (node) {
+            retStr = node->nodeType();
+            if (!retStr.empty()) {
+                fortranify(retStr.c_str(), retText, retText_len);
+            }
+        }
+    }
+}
+
+void rp_lib_node_id ( int* handle, char* retText, int retText_len ) {
+
+    std::string retStr = "";
+    RpLibrary* node = NULL;
+
+    if ((handle) && (*handle != 0)) {
+        node = getObject_Lib(*handle);
+
+        if (node) {
+            retStr = node->nodeId();
+            if (!retStr.empty()) {
+                fortranify(retStr.c_str(), retText, retText_len);
+            }
+        }
+    }
+}
+
 void rp_quit()
 {
@@ -701 +811 @@
 
     RpDictEntry DICT_TEMPLATE *hPtr;
-    // RpDictIterator DICT_TEMPLATE iter((RpDict&)*this);                     
+    // RpDictIterator DICT_TEMPLATE iter((RpDict&)*this);
     RpDictIterator DICT_TEMPLATE iter(fortObjDict_Lib);
-    
-    hPtr = iter.first();                                                      
-    
+
+    hPtr = iter.first();
+
     while (hPtr) {
         // Py_DECREF(*(hPtr->getValue()));
         hPtr->erase();
-        hPtr = iter.next();                                                   
+        hPtr = iter.next();
     }
 
@@ -717 +827 @@
     }
 
+}
+
+void rp_result(int* handle) {
+    RpLibrary* lib = NULL;
+
+    if (handle && *handle != 0) {
+        lib = getObject_Lib(*handle);
+        if (lib) {
+            lib->result();
+        }
+    }
 }
 
@@ -756 +877 @@
         fortObjDict_Lib.set(dictKey,objectName, &newEntry); 
     }
-    
+
     retVal = dictKey;
     return retVal;

trunk/src/fortran/RpUnitsFInterface.cc

@@ +1 @@
+/*
+ * ----------------------------------------------------------------------
+ *  INTERFACE: Fortran Rappture Units Source
+ *
+ * ======================================================================
+ *  AUTHOR:  Derrick Kearney, Purdue University
+ *  Copyright (c) 2005
+ *  Purdue Research Foundation, West Lafayette, IN
+ * ======================================================================
+ */
+
 #include "RpUnits.h"
 #include "RpDict.h"