User: knarf Date: 2011/08/04 09:02 PM
Modified: /PITTNullCode/SphericalHarmonicReconASCII/ interface.ccl, schedule.ccl /PITTNullCode/SphericalHarmonicReconASCII/src/ get.cc, read.cc, startup.cc
Log: rename some functions to avoid symbol collision with functions of the same name in SphericalHarmonicRecon
File Changes:
Directory: /PITTNullCode/SphericalHarmonicReconASCII/ =====================================================
File [modified]: interface.ccl Delta lines: +2 -2 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/interface.ccl 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/interface.ccl 2011-08-05 02:02:37 UTC (rev 51) @@ -21,7 +21,7 @@ CCTK_REAL OUT ARRAY reCt,\ CCTK_REAL OUT ARRAY imCt ) PROVIDES FUNCTION GetCurrentExtractionCoefs WITH \ - SphericalHarmonicRecon_GetCurrentCoefs LANGUAGE C + SphericalHarmonicReconASCII_GetCurrentCoefs LANGUAGE C
CCTK_INT \ @@ -30,4 +30,4 @@ CCTK_REAL OUT r_inner,\ CCTK_REAL OUT r_outer) PROVIDES FUNCTION GetExtractionParameters WITH \ - SphericalHarmonicRecon_GetParameters LANGUAGE C + SphericalHarmonicReconASCII_GetParameters LANGUAGE C
File [modified]: schedule.ccl Delta lines: +8 -8 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/schedule.ccl 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/schedule.ccl 2011-08-05 02:02:37 UTC (rev 51) @@ -7,8 +7,8 @@ # calls GetCurrentExtractionCoefs should be scheduled in this group SCHEDULE GROUP MetricReconstruction IN \ SphericalHarmonicReconRead \ - AFTER SphericalHarmonicRecon_ReadData \ - BEFORE SphericalHarmonicRecon_PostStep + AFTER SphericalHarmonicReconASCII_ReadData \ + BEFORE SphericalHarmonicReconASCII_PostStep { } "Group for use by external thorns to use the metric"
@@ -20,26 +20,26 @@ #{ #} "Schedule group for reconstructing world-tube data"
-SCHEDULE SphericalHarmonicRecon_ReadData IN SphericalHarmonicReconRead +SCHEDULE SphericalHarmonicReconASCII_ReadData IN SphericalHarmonicReconRead { LANG: C } "Read the world tube data and set the data flag to read"
-SCHEDULE SphericalHarmonicRecon_PostStep \ +SCHEDULE SphericalHarmonicReconASCII_PostStep \ IN SphericalHarmonicReconRead AFTER \ - SphericalHarmonicRecon_ReadData + SphericalHarmonicReconASCII_ReadData { LANG: C OPTIONS: GLOBAL } "set data flag to unread"
-SCHEDULE SphericalHarmonicRecon_Startup at CCTK_INITIAL +SCHEDULE SphericalHarmonicReconASCII_Startup at CCTK_INITIAL { LANG: C OPTIONS: GLOBAL } "startup"
-SCHEDULE SphericalHarmonicRecon_Startup at CCTK_POST_RECOVER_VARIABLES +SCHEDULE SphericalHarmonicReconASCII_Startup at CCTK_POST_RECOVER_VARIABLES { LANG: C OPTIONS: GLOBAL @@ -47,7 +47,7 @@
-SCHEDULE SphericalHarmonicRecon_Shutdown at CCTK_TERMINATE +SCHEDULE SphericalHarmonicReconASCII_Shutdown at CCTK_TERMINATE { LANG: C OPTIONS: GLOBAL
Directory: /PITTNullCode/SphericalHarmonicReconASCII/src/ =========================================================
File [modified]: get.cc Delta lines: +2 -2 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/src/get.cc 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/src/get.cc 2011-08-05 02:02:37 UTC (rev 51) @@ -28,7 +28,7 @@
/* Cactus Aliased Functions */
- int SphericalHarmonicRecon_GetParameters (CCTK_INT *lmax, + int SphericalHarmonicReconASCII_GetParameters (CCTK_INT *lmax, CCTK_REAL *r_inner, CCTK_REAL *r_outer) { @@ -39,7 +39,7 @@
- int SphericalHarmonicRecon_GetCurrentCoefs( + int SphericalHarmonicReconASCII_GetCurrentCoefs( CCTK_INT l, /* the ell mode */ CCTK_INT m, /* the m mode */ CCTK_REAL reC[], /* real part of (l,m) coefficient
File [modified]: read.cc Delta lines: +4 -4 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/src/read.cc 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/src/read.cc 2011-08-05 02:02:37 UTC (rev 51) @@ -92,7 +92,7 @@ }
- void SphericalHarmonicRecon_ReadData(CCTK_ARGUMENTS) + void SphericalHarmonicReconASCII_ReadData(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -100,8 +100,8 @@ if (! SHR::initialized) { CCTK_WARN(CCTK_WARN_ABORT, "Schedule mismatch. \n" - " SphericalHarmonicRecon_ReadData must be called after\n" - " SphericalHarmonicRecon_Startup"); + " SphericalHarmonicReconASCII_ReadData must be called after\n" + " SphericalHarmonicReconASCII_Startup"); }
//if (CCTK_MyProc(cctkGH) == 0) @@ -265,7 +265,7 @@
- void SphericalHarmonicRecon_PostStep(CCTK_ARGUMENTS) + void SphericalHarmonicReconASCII_PostStep(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; SHR::read_data = 0;
File [modified]: startup.cc Delta lines: +2 -2 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/src/startup.cc 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/src/startup.cc 2011-08-05 02:02:37 UTC (rev 51) @@ -23,7 +23,7 @@
using namespace std;
-extern "C" void SphericalHarmonicRecon_Startup(CCTK_ARGUMENTS) +extern "C" void SphericalHarmonicReconASCII_Startup(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -314,7 +314,7 @@
-extern "C" void SphericalHarmonicRecon_Shutdown(CCTK_ARGUMENTS) +extern "C" void SphericalHarmonicReconASCII_Shutdown(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS;