Changeset 165 for trunk/src/fortran

Timestamp:

Jan 31, 2006, 2:49:49 PM (19 years ago)

Author:

dkearney

Message:

1) removing matlab and octave tests for put*id functions
2) adding old fortran examples
3) minor changes to matlab and octave to fix rpUnitsGetBasis
4) rpUnitsMakeMetric does not work in matlab
5) changes to fortran bindings to return proper error codes.
6) added debugging to matlab compiling options and changed outdir location in Makefile

Location:

trunk/src/fortran

Files:

• RpLibraryFInterface.cc (modified) (3 diffs)
• RpUnitsFInterface.cc (modified) (10 diffs)

trunk/src/fortran/RpLibraryFInterface.cc

@@ -177 +177 @@
         lib = getObject_Lib(*handle);
         if (lib) {
-            if (*childHandle < 1) {
+
+            if (*childHandle > 0) {
                 // check to see if there were any previously returned children
                 childNode = getObject_Lib(*childHandle);
@@ -183 +184 @@
 
             // call the children base method
-            childNode = lib->children(path,childNode);
+            childNode = lib->children(inPath,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.
+            // children we should be able to check and see if the childHandle 
+            // was valid.
             // 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
@@ -199 +200 @@
                 }
                 else {
-                    newObjHandle = *childHandle;
+                    newObjHandle = storeObject_Lib(childNode,*childHandle);
                 }
             }

trunk/src/fortran/RpUnitsFInterface.cc

@@ -33 +33 @@
 
     if (basisName && *basisName) {
-        // basisStrName = fortObjDictUnits.find(*basisName);
         basisStrName = ObjDictUnits.find(*basisName);
 
@@ -41 +40 @@
     }
 
-    // newUnit = RpUnits::define(unitName, basis);
     newUnit = RpUnits::define(inText, basis);
 
@@ -65 +63 @@
     inText = null_terminate(searchName,searchName_len);
 
-    // RpUnits* searchUnit = RpUnits::find(searchName);
     const RpUnits* searchUnit = RpUnits::find(inText);
 
@@ -89 +86 @@
 
         if (newBasis) {
+            // make the metric extensions and retrieve the error code
             result = RpUnits::makeMetric(newBasis);
         }
     }
 
+    // return the error code
     return result;
 }
@@ -101 +100 @@
     const RpUnits* unitObj = NULL;
     std::string unitNameText = "";
-    int result = 0;
+    int result = 1;
 
     if (unitRefVal && *unitRefVal) {
@@ -108 +107 @@
             unitNameText = unitObj->getUnits();
             fortranify(unitNameText.c_str(), retText, retText_len);
+            result = 0;
         }
     }
@@ -119 +119 @@
     const RpUnits* unitObj = NULL;
     std::string unitNameText = "";
-    int result = 0;
+    int result = 1;
 
     if (unitRefVal && *unitRefVal) {
@@ -126 +126 @@
             unitNameText = unitObj->getUnitsName();
             fortranify(unitNameText.c_str(), retText, retText_len);
+            result = 0;
         }
     }
@@ -136 +137 @@
 {
     const RpUnits* unitObj = NULL;
-    int result = 0;
+    int result = 1;
 
     if (unitRefVal && *unitRefVal) {
@@ -142 +143 @@
         if (unitObj) {
             *retExponent = unitObj->getExponent();
+            result = 0;
         }
     }