Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@bp-login1.(none)>
Tue, 18 May 2010 22:47:24 +0000 (17:47 -0500)
committerIsaac Dooley <idooley2@bp-login1.(none)>
Tue, 18 May 2010 22:47:24 +0000 (17:47 -0500)
src/ck-cp/controlPoints.C
src/ck-cp/controlPoints.h
src/ck-cp/controlPointsf.h

index a02dea698af6c2f964300cf2d9da5fa8730b3434..eafa4e68bfa311003d528c42f735b5eedc716772 100644 (file)
@@ -181,7 +181,6 @@ CkReductionMsg *allMeasuresReduction(int nMsg,CkReductionMsg **msgs){
 /// If different seed, name, and random_seed values are provided, the returned values are pseudo-random
 unsigned int randInt(unsigned int num, const char* name, int seed=0){
   CkAssert(num > 0);
-  CkAssert(num < 1000);
 
   unsigned long hash = 0;
   unsigned int c;
@@ -1195,6 +1194,11 @@ FDECL void FTN_NAME(CONTROLPOINTTIMINGSTAMP,controlpointtimingstamp)()
 }
 
 
+FDECL void FTN_NAME(SETFRAMEWORKADVANCEPHASEF,setframeworkadvancephasef)(CMK_TYPEDEF_INT4 *value) 
+{
+  setFrameworkAdvancePhase(*value);
+}
+
 
 
 
index 88b090312882584529c61e4ae279486ab868af25..ef1cda9f3297cdc6e303b5975aff92e4acc4bf0a 100644 (file)
@@ -63,6 +63,7 @@
 
 
 void registerCPChangeCallback(CkCallback cb, bool frameworkShouldAdvancePhase);
+
 void setFrameworkAdvancePhase(bool frameworkShouldAdvancePhase);
 
 
index 7e7af61cf9754621d324079a570f3fd6814624f6..03735f5d59b801b7490e91f772f2c22a7447f652 100644 (file)
@@ -8,10 +8,18 @@ end subroutine
 subroutine gotoNextPhase()
 end subroutine
 
+
+subroutine  setFrameworkAdvancePhaseF(value)
+     integer*4 value
+end subroutine
+
+
 integer function controlPoint(lb, ub)
      integer*4 :: lb
 integer*4 :: ub
 end function
 
+
+
 end interface