Remove obsolete code in DEBUG_MEM* sections

include/SW_Control.h

@@ -39,10 +39,6 @@ void SW_CTL_main(SW_ALL* sw, SW_OUTPUT_POINTERS* SW_OutputPtrs,
 void SW_CTL_run_current_year(SW_ALL* sw, SW_OUTPUT_POINTERS* SW_OutputPtrs,
                              LOG_INFO* LogInfo);
 
-#ifdef DEBUG_MEM
-void SW_CTL_SetMemoryRefs(SW_OUTPUT SW_Output[]);
-#endif
-
 
 #ifdef __cplusplus
 }

include/SW_Files.h

@@ -58,10 +58,6 @@ void SW_F_construct(char *InFiles[], const char *firstfile, char _ProjDir[],
 void SW_F_deconstruct(char *InFiles[]);
 void SW_CSV_F_INIT(const char *s, LOG_INFO* LogInfo);
 
-#ifdef DEBUG_MEM
-void SW_F_SetMemoryRefs(void);
-#endif
-
 
 #ifdef __cplusplus
 }

include/SW_Markov.h

@@ -33,10 +33,6 @@ void SW_MKV_setup(SW_MARKOV* SW_Markov, unsigned long Weather_rng_seed,
 void SW_MKV_today(SW_MARKOV* SW_Markov, TimeInt doy0, TimeInt year,
 			RealD *tmax, RealD *tmin, RealD *rain, LOG_INFO* LogInfo);
 
-#ifdef DEBUG_MEM
-void SW_MKV_SetMemoryRefs( void);
-#endif
-
 
 #ifdef __cplusplus
 }

include/SW_Output.h

@@ -306,11 +306,6 @@ void get_biomass_SXW(OutPeriod pd, SW_ALL* sw);
 #endif
 
 
-#ifdef DEBUG_MEM
-	void SW_OUT_SetMemoryRefs(SW_OUTPUT SW_Output[]);
-#endif
-
-
 #ifdef __cplusplus
 }
 #endif

include/SW_Site.h

@@ -255,10 +255,6 @@ void set_soillayers(SW_VEGPROD* SW_VegProd, SW_SITE* SW_Site,
 void derive_soilRegions(SW_SITE* SW_Site, int nRegions,
 						RealD *regionLowerBounds, LOG_INFO* LogInfo);
 
-#ifdef DEBUG_MEM
-	void SW_SIT_SetMemoryRefs(void);
-#endif
-
 
 #ifdef __cplusplus
 }

include/SW_SoilWater.h

@@ -161,10 +161,6 @@ double SWRC_SWPtoSWC_FXW(
 void SW_WaterBalance_Checks(SW_ALL* sw, LOG_INFO* LogInfo);
 #endif
 
-#ifdef DEBUG_MEM
-void SW_SWC_SetMemoryRefs(void);
-#endif
-
 
 #ifdef __cplusplus
 }

include/SW_Weather.h

@@ -143,10 +143,6 @@ void SW_WTH_new_day(SW_WEATHER* SW_Weather, SW_SITE* SW_Site, RealD snowpack[],
 void SW_WTH_sum_today(void);
 
 
-#ifdef DEBUG_MEM
-void SW_WTH_SetMemoryRefs(void);
-#endif
-
 
 #ifdef __cplusplus
 }

include/myMemory.h

@@ -10,9 +10,6 @@
 #include "include/SW_datastructs.h"
 
 
-#ifdef DEBUG_MEM
-#include "include/memblock.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {

src/SW_Control.c

@@ -370,32 +370,3 @@ void SW_CTL_read_inputs_from_disk(SW_ALL* sw, PATH_INFO* PathInfo,
   if (debug) swprintf(" completed.\n");
   #endif
 }
-
-
-
-#ifdef DEBUG_MEM
-#include "include/SW_Markov.h"  /* for setmemrefs function */
-
-/**
-@brief This routine sets the known memory refs so they can be
-      checked for leaks, etc.  Includes malloc-ed memory in
-      SOILWAT.  All refs will have been cleared
-      by a call to ClearMemoryRefs() before this, and will be
-      checked via CheckMemoryRefs() after this, most likely in
-      the main() function.
-*/
-void SW_CTL_SetMemoryRefs(SW_OUTPUT SW_Output[]) {
-	/* when debugging memory problems, use the bookkeeping
-	 code in myMemory.c
-
-	 */
-
-	SW_F_SetMemoryRefs();
-	SW_OUT_SetMemoryRefs(SW_Output);
-	SW_SWC_SetMemoryRefs();
-	SW_SIT_SetMemoryRefs();
-	SW_WTH_SetMemoryRefs();
-	SW_MKV_SetMemoryRefs();
-}
-
-#endif

src/SW_Files.c

@@ -253,24 +253,3 @@ void SW_F_deconstruct(char *InFiles[]) {
 		}
 	}
 }
-#ifdef DEBUG_MEM
-#include "include/myMemory.h"
-/*======================================================*/
-void SW_F_SetMemoryRefs( void) {
-	/* when debugging memory problems, use the bookkeeping
-	 code in myMemory.c
-	 This routine sets the known memory refs in this module
-	 so they can be  checked for leaks, etc.  Includes
-	 malloc-ed memory in SOILWAT.  All refs will have been
-	 cleared by a call to ClearMemoryRefs() before this, and
-	 will be checked via CheckMemoryRefs() after this, most
-	 likely in the main() function.
-	 */
-	SW_FileIndex i;
-
-	for ( i=eFirst; i < eEndFile; i++)
-	NoteMemoryRef(InFiles[i]);
-
-}
-
-#endif

src/SW_Markov.c

@@ -646,30 +646,3 @@ void SW_MKV_setup(SW_MARKOV* SW_Markov, unsigned long Weather_rng_seed,
     );
   }
 }
-
-
-#ifdef DEBUG_MEM
-#include "include/myMemory.h"
-/*======================================================*/
-void SW_MKV_SetMemoryRefs( void) {
-	/* when debugging memory problems, use the bookkeeping
-	 code in myMemory.c
-	 This routine sets the known memory refs in this module
-	 so they can be  checked for leaks, etc.  All refs will
-	 have been cleared by a call to ClearMemoryRefs() before
-	 this, and will be checked via CheckMemoryRefs() after
-	 this, most likely in the main() function.
-	 */
-
-	NoteMemoryRef(SW_Markov.wetprob);
-	NoteMemoryRef(SW_Markov.dryprob);
-	NoteMemoryRef(SW_Markov.avg_ppt);
-	NoteMemoryRef(SW_Markov.std_ppt);
-	NoteMemoryRef(SW_Markov.cfxw);
-	NoteMemoryRef(SW_Markov.cfxd);
-	NoteMemoryRef(SW_Markov.cfnw);
-	NoteMemoryRef(SW_Markov.cfnd);
-
-}
-
-#endif

src/SW_Output.c

@@ -2658,31 +2658,6 @@ void _echo_all_inputs(SW_ALL* sw, LOG_INFO* LogInfo) {
 }
 
 
-#ifdef DEBUG_MEM
-#include "include/myMemory.h"
-/** when debugging memory problems, use the bookkeeping
-  code in myMemory.c
-  This routine sets the known memory refs in this module
-  so they can be  checked for leaks, etc.  Includes
-  malloc-ed memory in SOILWAT.  All refs will have been
-  cleared by a call to ClearMemoryRefs() before this, and
-  will be checked via CheckMemoryRefs() after this, most
-  likely in the main() function.
-*/
-void SW_OUT_SetMemoryRefs(SW_OUTPUT SW_Output[])
-{
-	OutKey k;
-
-	ForEachOutKey(k)
-	{
-		if (SW_Output[k].use)
-		//NoteMemoryRef(SW_Output[k].outfile);
-	}
-
-}
-
-#endif
-
 
 /*==================================================================*/
 /**

src/SW_Site.c

@@ -2612,25 +2612,3 @@ void _echo_inputs(SW_SITE* SW_Site, LOG_INFO* LogInfo) {
 	);
 	//fflush(LogInfo);
 }
-
-#ifdef DEBUG_MEM
-#include "include/myMemory.h"
-/*======================================================*/
-void SW_SIT_SetMemoryRefs( void) {
-	/* when debugging memory problems, use the bookkeeping
-	 code in myMemory.c
-	 This routine sets the known memory refs in this module
-	 so they can be  checked for leaks, etc.  All refs will
-	 have been cleared by a call to ClearMemoryRefs() before
-	 this, and will be checked via CheckMemoryRefs() after
-	 this, most likely in the main() function.
-	 */
-	LyrIndex l;
-
-	NoteMemoryRef(SW_Site.lyr);
-	ForEachSoilLayer(l) {
-		NoteMemoryRef(SW_Site.lyr[l]);
-	}
-}
-
-#endif

src/SW_SoilWater.c

@@ -1855,31 +1855,3 @@ double SWRC_SWPtoSWC_FXW(
 	// convert matric theta [cm / cm] to bulk SWC [cm]
 	return (1. - gravel) * width * res;
 }
-
-
-
-
-/**
-@brief This routine sets the known memory refs in this module
-     so they can be  checked for leaks, etc.
-*/
-
-#ifdef DEBUG_MEM
-#include "include/myMemory.h"
-/*======================================================*/
-void SW_SWC_SetMemoryRefs( void) {
-	/* when debugging memory problems, use the bookkeeping
-	 code in myMemory.c
-	 This routine sets the known memory refs in this module
-	 so they can be  checked for leaks, etc.  Includes
-	 malloc-ed memory in SOILWAT.  All refs will have been
-	 cleared by a call to ClearMemoryRefs() before this, and
-	 will be checked via CheckMemoryRefs() after this, most
-	 likely in the main() function.
-	 */
-
-	/*  NoteMemoryRef(SW_Soilwat.hist.file_prefix); */
-
-}
-
-#endif

src/SW_Weather.c

@@ -2088,19 +2088,3 @@ void deallocateClimateStructs(SW_CLIMATE_YEARLY *climateOutput,
     free(climateOutput->maxTempMon_C);
     free(climateOutput->minTempMon_C);
 }
-
-#ifdef DEBUG_MEM
-#include "include/myMemory.h"
-/*======================================================*/
-void SW_WTH_SetMemoryRefs( void) {
-	/* when debugging memory problems, use the bookkeeping
-	 code in myMemory.c
-	 This routine sets the known memory refs in this module
-	 so they can be  checked for leaks, etc.  All refs will
-	 have been cleared by a call to ClearMemoryRefs() before
-	 this, and will be checked via CheckMemoryRefs() after
-	 this, most likely in the main() function.
-	 */
-}
-
-#endif