Changeset 83 for trunk/examples/app-fermi

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/examples/app-fermi/fortran

Files:

• Makefile (modified) (1 diff)
• fermi.f (modified) (2 diffs)

trunk/examples/app-fermi/fortran/Makefile

@@ -14 +14 @@
 
 LIB_DIR = $(RAPPTURE_DIR)/lib
-LIB_RAPPTURE    = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lrappture
+LIB_RAPPTURE    = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lrappture_test
 
 all: $(PROGS)

trunk/examples/app-fermi/fortran/fermi.f

@@ -13 +13 @@
         IMPLICIT NONE
 
-        integer rp_lib
-        double precision rp_lib_get_double
+        integer rp_lib, rp_units_convert_dbl, rp_units_add_presets
 
-        integer driver
+        integer driver, ok
         double precision T, Ef, kT, Emin, Emax, dE, f, E
-        CHARACTER*100 inFile
+        CHARACTER*100 inFile, strVal
         character*40 xy
 
@@ -24 +23 @@
         driver = rp_lib(inFile)
 
-        T = rp_lib_get_double(driver,
-     +        "input.number(temperature).current")
-        Ef = rp_lib_get_double(driver,
-     +        "input.number(Ef).current")
+        ok = rp_units_add_presets("all")
+
+        call rp_lib_get(driver,
+     +        "input.number(temperature).current", strVal)
+        ok = rp_units_convert_dbl(strVal,"K",T)
+
+        call rp_lib_get(driver,
+     +        "input.number(Ef).current", strVal)
+        ok = rp_units_convert_dbl(strVal,"K",Ef)
 
         kT = 8.61734e-5 * T