Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@bp-login1.(none)>
Tue, 4 May 2010 15:05:00 +0000 (10:05 -0500)
committerIsaac Dooley <idooley2@bp-login1.(none)>
Tue, 4 May 2010 15:05:00 +0000 (10:05 -0500)
src/arch/bluegenel/conv-mach.sh
src/arch/common/conv-mach-ifort.sh
src/conv-ccs/middle-ccs.C
src/util/sockRoutines.h

index 987ef7d65b4de6833724d8ff9819777312fb414c..a3bac84ba989539c30f65aef86a938188368d783 100644 (file)
@@ -17,12 +17,12 @@ then
 fi
 
 BGL_BIN=$BGL_FLOOR/blrts-gnu/bin
-BGL_INC="-I$BGL_INSTALL/bglsys/include"
+BGL_INC="-I$BGL_INSTALL/bglsys/include -I/gsa/yktgsa/home/g/m/gmartyna/dev/myincs"
 #-I$BGL_INSTALL/blrts-gnu/powerpc-bgl-blrts-gnu/sys-include/" 
 
 #BGL_LIB="-L$BGL_INSTALL/bglsys/lib -L/gsa/watgsa/home/s/a/sameer77/bgx/new2/bglsw-install/blrts-gnu/powerpc-bgl-blrts-gnu/lib -lc"
 
-BGL_LIB="-L$BGL_INSTALL/bglsys/lib"        #" -L$BGL_INSTALL/blrts-gnu/powerpc-bgl-blrts-gnu/lib"
+BGL_LIB="-L$BGL_INSTALL/bglsys/lib -L/gsa/yktgsa/home/g/m/gmartyna/dev/mylibs"        #" -L$BGL_INSTALL/blrts-gnu/powerpc-bgl-blrts-gnu/lib"
 
 # test if compiler binary present
 if test ! -x $BGL_BIN/powerpc-bgl-blrts-gnu-g++
index 4f746a537fee03f0e81c3bdbc68dc3e68c084a55..b2b759386b90bb14b1e00faa43abe1f87bc84b93 100644 (file)
@@ -10,7 +10,15 @@ then
 fi
 if test -x "$F90DIR" 
 then
-  F90LIBDIR="`dirname $F90DIR`/../lib"
+  F90DIR=`dirname $F90DIR`
+  Minor=`basename $F90DIR`
+  if test "$Minor" = "intel64"
+  then
+    F90DIR=`dirname $F90DIR`
+    F90LIBDIR="$F90DIR/../lib/$Minor"
+  else
+    F90LIBDIR="$F90DIR/../lib"
+  fi
   F90MAIN="$F90LIBDIR/for_main.o"
 fi
 # for_main.o is important for main() in f90 code
index 6aa4425f17138cb3979b39db6503dc449db9cc1c..ebd6fc3b58fa6698a959ad5ce2c183317626139e 100644 (file)
@@ -77,7 +77,7 @@ extern "C" int CcsReply(CcsImplHeader *rep,int repLen,const void *repData) {
   }
   return 0;
 }
-#endif
+
 
 /**********************************************
   "ccs_getinfo"-- takes no data
@@ -101,7 +101,7 @@ void ccs_getinfo(char *msg)
 }
 
 ///////////////////////////////// middle-debug.C
-
+#endif
 #if ! CMK_HAS_GETPID
 typedef int pid_t;
 #endif
index 02f54295deeec8dd90cb0d9ecc3a3bdcc113ba20..40b12cb64b5eea91f0e43fa6484db38a685b2990 100644 (file)
@@ -193,7 +193,6 @@ int skt_sendV(SOCKET fd,int nBuffers,const void **buffers,int *lengths);
 }
 #endif
 
-#endif /*!CMK_NO_SOCKETS*/
 
 /***********************************
 Conv-host messages: these are a simple
@@ -303,6 +302,7 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
+#endif /*!CMK_NO_SOCKETS*/
 
 #endif /*SOCK_ROUTINES_H*/