Changeset 2172 for branches/blt4/examples/app-fermi

Timestamp:

Mar 30, 2011, 12:55:46 PM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/examples/app-fermi

Files:

• cee/Makefile.in (modified) (1 diff)
• fortran/Makefile.in (modified) (1 diff)
• java/Fermi.java (modified) (1 diff)
• java/Makefile.in (modified) (1 diff)
• octave/Makefile.in (modified) (1 diff)
• wrapper/cee/Makefile.in (modified) (1 diff)
• wrapper/cee/fermi.c (modified) (2 diffs)

branches/blt4/examples/app-fermi/cee/Makefile.in

@@ -22 +22 @@
 INCLUDES        = -I$(srcdir)/../../../src/core
 LIBS            = -L../../../src/core -lrappture \
-                  -L$(libdir) -lexpat -lz
+                  -L$(libdir) -lexpat -lz -lm
 
 CC_SWITCHES     = $(CFLAGS) $(CDEBUGFLAGS) $(DEFINES) $(INCLUDES)

branches/blt4/examples/app-fermi/fortran/Makefile.in

@@ -22 +22 @@
 INCLUDES        = -I$(srcdir)/../../../src/core
 LIBS            = -L../../../src/core -lrappture \
-                  -L$(libdir) -lexpat -lz
+                  -L$(libdir) -lexpat -lz -lm
 
 FC_SWITCHES     = $(FCFLAGS) $(FCDEBUGFLAGS) $(DEFINES) $(INCLUDES)

branches/blt4/examples/app-fermi/java/Fermi.java

@@ -22 +22 @@
     // read the input values and convert to correct units
     String Tstr = driver.get("input.number(temperature).current");
-    double T = Double.valueOf(rappture.Units.convert(Tstr, "K", false));
+    double T = Double.valueOf(rappture.Units.convertString(Tstr, "K", false));
     String Efstr = driver.get("input.number(Ef).current");
-    double Ef = Double.valueOf(rappture.Units.convert(Efstr, "eV", false));
+    double Ef = Double.valueOf(rappture.Units.convertString(Efstr, "eV", false));
 
     // Set the energy range and step size

branches/blt4/examples/app-fermi/java/Makefile.in

@@ -15 +15 @@
 
 JAVAC           = @JAVAC@ 
-CLASSPATH       = $(libdir)/java:../../../lang/java
+CLASSPATH       = ../../../lang/java:$(libdir)/java
 
 destdir         = $(prefix)/examples/app-fermi/java

branches/blt4/examples/app-fermi/octave/Makefile.in

@@ -13 +13 @@
 
 INSTALL         = @INSTALL@
+MKDIR_P         = @MKDIR_P@
 
-all: all_2 all_3
+SUBDIRS         = 2 3
 
-all_2:
-        $(MAKE) -C 2 all
+all: 
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i all || exit 1 ;\
+        done
 
-all_3:
-        $(MAKE) -C 3 all
-
-
-install: install_2 install_3
-
-install_2:
-        $(MAKE) -C 2 install
-
-install_3:
-        $(MAKE) -C 3 install
+install: 
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i install || exit 1 ;\
+        done
 
 clean:
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i clean ;\
+        done
 
 distclean: clean

branches/blt4/examples/app-fermi/wrapper/cee/Makefile.in

@@ -22 +22 @@
 INCLUDES        = -I$(srcdir)/../../../../src/core
 LIBS            = -L../../../../src/core -lrappture \
-                  -L$(libdir) -lexpat -lz
+                  -L$(libdir) -lexpat -lz -lm
 
 CC_SWITCHES     = $(CFLAGS) $(CDEBUGFLAGS) $(DEFINES) $(INCLUDES)

branches/blt4/examples/app-fermi/wrapper/cee/fermi.c

@@ -73 +73 @@
     err = system("octave --silent fermi.m < indeck");
 
-    if (err != 0) {
+    if (err == 1) {
         fprintf(stderr,"%s: calling octave science program failed",prog);
         exit(err);
@@ -96 +96 @@
     fp = fopen("out.dat","r");
     if (fp == NULL) {
-        fprintf(stderr,"%s: Error while writing to out.dat", prog);
+        fprintf(stderr,"%s: Error while writing to out.dat",prog);
         exit(1);
     }