Removed SINKING

main.c

@@ -8,9 +8,6 @@
 #include <string.h>
 #include <time.h>
 #include <assert.h>
-#ifdef SINKING
-#include <fenv.h>
-#endif
 #include "mdl.h"
 #include "master.h"
 #include "outtype.h"
@@ -192,9 +189,6 @@ int main(int argc,char **argv)
 				fclose(fp);
 				}
 			}
-#endif
-#ifdef SINKING
-		msrDrift(msr,dTime,0); /* Need to set up vPred for sinking particles on restarts */
 #endif
 		if(msrKDK(msr) || msr->param.bGravStep || msr->param.bAccelStep) {
 			msrActiveType(msr,TYPE_ALL,TYPE_ACTIVE);
@@ -371,9 +365,6 @@ int main(int argc,char **argv)
 		msrInitAccel(msr);
 		msrActiveType(msr,TYPE_ALL,TYPE_ACTIVE|TYPE_TREEACTIVE);
 		msrUpdateSoft(msr,dTime);
-#ifdef SINKING
-		msrDrift(msr,dTime,0); /* Need to set up vPred for sinking particles on restarts */
-#endif
 		msrActiveType(msr,TYPE_ALL,TYPE_ACTIVE|TYPE_TREEACTIVE);
 		msrBuildTree(msr,0,dMass,0);
 		msrMassCheck(msr,dMass,"After msrBuildTree");
@@ -648,9 +639,6 @@ int main(int argc,char **argv)
 #endif
                 }
 
-#ifdef SINKING
-	    msrDrift(msr,dTime,0); /* Need to set up vPred for sinking particles on restarts */
-#endif
             if (msrDoGravity(msr)) {
                 msrActiveType(msr,TYPE_ALL,TYPE_ACTIVE|TYPE_TREEACTIVE|TYPE_SMOOTHACTIVE );
                 msrDomainDecomp(msr,0,1);

master.c

@@ -2763,9 +2763,6 @@ void msrLogDefines(FILE *fp)
 #ifdef PARTICLESPLIT
 	fprintf(fp, " PARTICLESPLIT");
 #endif
-#ifdef SINKING
-	fprintf(fp, " SINKING");
-#endif
 #ifdef SINKINGAVERAGE
 	fprintf(fp, " SINKINGAVERAGE");
 #endif
@@ -8430,19 +8427,6 @@ void msrTopStepKDK(MSR msr,
 				printf("SPH: iRung %d to %d\n",iRung,iKickRung);
 			    msrSph(msr, dTime, iKickRung);
 			    }
-#ifdef SINKING
-			if (msr->param.bDoSinks) {
-/* This must be done after all forces */
-			    if (!(msrDoGas(msr) && msrSphCurrRung(msr,iKickRung,1))) {
-                    msrActiveType(msr,TYPE_GAS,TYPE_TREEACTIVE|TYPE_SMOOTHACTIVE);
-                    msrBuildTree(msr,1,-1.0,1);
-                    }
-			    msrSetType(msr, TYPE_SINKING, TYPE_INFLOW);
-			    msrResetType(msr,TYPE_SINK,TYPE_SMOOTHDONE);
-			    msrActiveTypeRung(msr,TYPE_SINK,TYPE_ACTIVE|TYPE_SMOOTHACTIVE,iKickRung,1);
-			    msrSmooth(msr,dTime,SMX_SINKINGFORCESHARE,1);
-			    }
-#endif
 #endif
 
 #ifdef INFLOWOUTFLOW

mode.h

@@ -10,7 +10,6 @@
 #define SUPERBUBBLE	          //Use the Keller+ 2014 Superbubble feedback 
 #define STARFORM              //Make new stars according to the starformation recipe
 #define CHABRIER              //Use the Chabrier 2003 IMF for starformation (See DOI:10.1086/376392)  (SHOULD BE DEFAULT)
-#define SINKING               //Include support for sink particles
 #define DIFFUSION             //Enable Thermal Diffusion
 #endif