clean up code

src/binary_c_macros.h

@@ -836,6 +836,7 @@
         "HG fractional envelope",               \
     }
 
+
 #define NOVA_STATE_NONE 0
 #define NOVA_STATE_TRIGGER 1
 #define NOVA_STATE_POST 2

src/evolution/evolution_difflog.c

@@ -475,7 +475,7 @@ static void cf_diffstats(struct stardata_t * RESTRICT const stardata,
         {
             const Boolean novae =
                 stardata->preferences->individual_novae == TRUE ?
-                Boolean_(now->novastate[k] != NOVA_STATE_NONE) :
+                Boolean_(now->novastate[k] == TRUE) :
                 Boolean_(now->novarate[k] < 0.0);
             
             if((novae == TRUE) &&

src/timestep/timestep_limits.c

@@ -289,6 +289,7 @@ void timestep_limits(Timestep_prototype_args)
                                                             star->mass);
                     }
 
+#ifdef __DEPRECATED
                     if(star->novastate == NOVA_STATE_TRIGGER)
                     {
                         /* 
@@ -322,7 +323,12 @@ void timestep_limits(Timestep_prototype_args)
                          */
                         dtlim = stardata->preferences->timestep_multipliers[DT_LIMIT_NOVAE] * star->dtnova;
                     }
+#endif
 
+                    star->dtnova = nova_recurrence_time(accretion_rate,
+                                                            star->mass);
+                    dtlim = stardata->preferences->timestep_multipliers[DT_LIMIT_NOVAE] * star->dtnova;
+                    
                     dtlim *= 1e-6; // convert to Myr
                     
                     /*