Changeset 185

Timestamp:

Feb 16, 2006, 9:46:33 PM (19 years ago)

Author:

cxsong

Message:

moved to rappture/src/mesh

Location:

trunk/src/mesh

Files:

• Makefile (modified) (5 diffs)
• grid1d.cc (added)
• grid1d.h (modified) (1 diff)
• grid1d_reg.cc (added)
• grid2d.cc (added)

trunk/src/mesh/Makefile

@@ -82 +82 @@
                   RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o #RpValue.o\
                   # RpValueDouble.o RpValueString.o
-RP_MESH_DEPS = rp_defs.o grid1d.o grid1d_reg.o #grid2d.o mesh.o field.o 
+RP_MESH_DEPS = util.o grid1d.o grid1d_reg.o grid2d.o #mesh.o field.o endian.o
 
 LDLIB_MACOSX = -dynamiclib -o $(LIB_DIR)/$@.dylib
 LDLIB_LINUX = -shared -Wl,-rpath,$(LIB_DIR)/ -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0
-LDLIB_LINUX_MESH = -shared -Wl,-rpath,../$(LIB_DIR)/mesh/ -Wl,-soname,$@.so -o ../$(LIB_DIR)/mesh/$@.so.0.0
+LDLIB_LINUX_MESH = -shared -Wl,-rpath,$(LIB_DIR)/mesh/ -Wl,-soname,$@.so -o $(LIB_DIR)/mesh/$@.so.0.0
 
 # include rappture library definitions
@@ -93 +93 @@
 
 librpmesh: $(RP_MESH_DEPS)
-        if test "`uname`" == "Darwin"; then \
-                $(CXX) $(DEGUG) $(LDLIB_MACOSX) $^ $(LIB_SCEW_FLAG) -lm; \
-                ar -r $@.a $^; \
-                ranlib -s $@.a; \
-        else \
-                $(CXX) $(DEGUG) $(LDLIB_LINUX_MESH) $^ $(LIB_SCEW_FLAG) -lm; \
-                /sbin/ldconfig -n $(LIB_DIR); \
-                ar -r $@.a $^; \
-                ranlib $@.a; \
-        fi
-librappture: $(RP_IO_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS)
         if test "`uname`" == "Darwin"; then \
                 $(CXX) $(DEGUG) $(LDLIB_MACOSX) $^ $(LIB_SCEW_FLAG) -lm; \
@@ -114 +103 @@
                 ranlib $@.a; \
         fi
+librappture: $(RP_IO_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS)
+        if test "`uname`" == "Darwin"; then \
+                $(CXX) $(DEGUG) $(LDLIB_MACOSX) $^ $(LIB_SCEW_FLAG) -lm; \
+                ar -r $@.a $^; \
+                ranlib -s $@.a; \
+        else \
+                $(CXX) $(DEGUG) $(LDLIB_LINUX) $^ $(LIB_SCEW_FLAG) -lm; \
+                /sbin/ldconfig -n $(LIB_DIR); \
+                ar -r $@.a $^; \
+                ranlib $@.a; \
+        fi
 
 install_rappture: librappture
@@ -166 +166 @@
 # include mesh objects
 #
+grid2d.o: grid2d.cc
+        $(CXX) $(CFLAGS) $(DEBUG) -c $?
 grid1d.o: grid1d.cc
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 grid1d_reg.o: grid1d_reg.cc
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
-rp_defs.o: rp_defs.cc
+util.o: util.cc
+        $(CXX) $(CFLAGS) $(DEBUG) -c $?
+endian.o: endian.cc
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 
@@ -338 +342 @@
         - rm -f *.o librappture.so* librappture.a libRp*.so* rp*.mex* $(OCTAVE_SRC)/rp*.o*
         - rm -rf build
+
+#################
+endiantest: endiantest.o 
+        $(CXX) -o $@ $<

trunk/src/mesh/grid1d.h

@@ -20 +20 @@
 
         // return number of points in grid
-        int size() { return m_data.size(); }
+        int numPoints() { return m_data.size(); }
 
         // change the size of the grid after grid is constructed
-        void resize(int size) { m_data.resize(size); }
+        void resize(int npoints) { m_data.resize(npoints); }
 
         // serialize data