climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [38/50] [abbrv] git commit: remove unnecessary files
Date Thu, 16 Oct 2014 17:17:34 GMT
remove unnecessary files


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c1e22a93
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c1e22a93
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c1e22a93

Branch: refs/heads/master
Commit: c1e22a93f8b9a00ae9eb2826d084594065996099
Parents: 99f6e36
Author: kwhitehall <k_whitehall@yahoo.com>
Authored: Sun Apr 13 20:59:22 2014 -0400
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Wed Oct 15 15:18:04 2014 -0700

----------------------------------------------------------------------
 mccsearch/code/files.pyc               |  Bin 18453 -> 0 bytes
 mccsearch/code/mainProgGoyens.py       |  126 -
 mccsearch/code/mainProgTemp.py         |   99 -
 mccsearch/code/mainProgWorks.py        |  124 -
 mccsearch/code/mccSearch.pyc           |  Bin 98227 -> 0 bytes
 mccsearch/code/mccSearchGoyens.py      | 3606 ---------------------------
 mccsearch/code/newPreprocessingMERG.py |  175 --
 mccsearch/code/preprocessingMERG.py    |  125 -
 mccsearch/code/process.pyc             |  Bin 29786 -> 0 bytes
 9 files changed, 4255 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/c1e22a93/mccsearch/code/files.pyc
----------------------------------------------------------------------
diff --git a/mccsearch/code/files.pyc b/mccsearch/code/files.pyc
deleted file mode 100644
index f8a5577..0000000
Binary files a/mccsearch/code/files.pyc and /dev/null differ

http://git-wip-us.apache.org/repos/asf/climate/blob/c1e22a93/mccsearch/code/mainProgGoyens.py
----------------------------------------------------------------------
diff --git a/mccsearch/code/mainProgGoyens.py b/mccsearch/code/mainProgGoyens.py
deleted file mode 100644
index ad54ab1..0000000
--- a/mccsearch/code/mainProgGoyens.py
+++ /dev/null
@@ -1,126 +0,0 @@
-'''
-# running the program
-# Kim Whitehall Nov 2012
-# Last updated: 15 May 2013
-'''
-
-#import rcmes
-import sys
-import networkx as nx
-import mccSearchGoyens
-#import cloudclusters
-import numpy as np
-import numpy.ma as ma
-import files
-import matplotlib.pyplot as plt
-
-def main():
-    CEGraph = nx.DiGraph()
-    prunedGraph = nx.DiGraph()
-    MCCList =[]
-    MCSList=[]
-    MCSMCCNodesList =[]
-    allMCSsList =[]
-    allCETRMMList =[]
-    mainDirStr= "/Users/kimwhitehall/Documents/HU/research/mccSearchGoyens/caseStudy1"
-    #directories for the original data
-    TRMMdirName = "/Users/kimwhitehall/Documents/HU/research/DATA/TRMM" #compSciPaper/case2/TRMM"
-    CEoriDirName = "/Users/kimwhitehall/Documents/HU/research/DATA/mergNETCDF"
-    #allMCSsDict ={{}}
-
-    # mccSearchGoyens.preprocessingMERG("/Users/kimwhitehall/Documents/HU/research/DATA")
-    # sys.exit()
-
-    # # mccSearchGoyens.plotAccTRMM(TRMMCEdirName)
-    # sys.exit()
-
-    #create main directory and file structure for storing intel
-    mccSearchGoyens.createMainDirectory(mainDirStr)
-    TRMMCEdirName = mainDirStr+'/TRMMnetcdfCEs'
-    CEdirName = mainDirStr+'/MERGnetcdfCEs'
-
-    # #mccSearchGoyens.postProcessingNetCDF(3,CEoriDirName)
-    # mccSearchGoyens.postProcessingNetCDF(2)
-    # sys.exit()
-
-    #using merg data ***********
-    print "\n -------------- Read MERG Data ----------"
-    mergImgs, timeList = mccSearchGoyens.readMergData(CEoriDirName)
-    print ("-"*80)
-
-    print 'in main', len(mergImgs)
-    print "\n -------------- TESTING findCloudElements ----------"
-    CEGraph = mccSearchGoyens.findCloudElements(mergImgs,timeList,TRMMdirName)
-    #if the TRMMdirName isnt entered for what ever reason
-    # CEGraph = mccSearchGoyens.findCloudElements(mergImgs,timeList)
-    # allCETRMMList=mccSearchGoyens.findPrecipRate(TRMMdirName)
-    # sys.exit()
-    print ("-"*80)
-    print "number of nodes in CEGraph is: ", CEGraph.number_of_nodes()
-    print ("-"*80)    
-    print "\n -------------- TESTING findCloudClusters ----------"
-    prunedGraph = mccSearchGoyens.findCloudClusters(CEGraph)
-    print ("-"*80)
-    print "number of nodes in prunedGraph is: ", prunedGraph.number_of_nodes()
-    print ("-"*80)
-    #sys.exit()
-    print "\n -------------- TESTING findMCCs ----------"
-    MCCList,MCSList = mccSearchGoyens.findMCC(prunedGraph)
-    print ("-"*80)
-    print "MCC List has been acquired ", len(MCCList)
-    # for eachList in MCCList:
-    #     print eachList
-    #     for eachNode in eachList:
-    #         print eachNode, mccSearchGoyens.thisDict(eachNode)['nodeMCSIdentifier']
-    print "MCS List has been acquired ", len(MCSList)
-    # for eachList in MCSList:
-    #     print eachList
-    #     for eachNode in eachList:
-    #         print eachNode, mccSearchGoyens.thisDict(eachNode)['nodeMCSIdentifier']
-    print ("-"*80)
-    #sys.exit()
-    print "\n -------------- TESTING TRMM ----------"
-    #now ready to perform various calculations/metrics
-    print "\n -------------- TESTING METRICS ----------"
-    #MCCTimes, tdelta = mccSearchGoyens.temporalAndAreaInfoMetric(MCCList)
-    print ("-"*80)
-    #print "MCCTimes is: ", MCCTimes
-    print "creating the MCS userfile ", mccSearchGoyens.createTextFile(MCCList)
-
-    # print "number of MCCs is: ", mccSearchGoyens.numberOfFeatures(MCCList)
-    # print "longest duration is: ", mccSearchGoyens.longestDuration(MCCTimes), "hrs"
-    # print "shortest duration is: ", mccSearchGoyens.shortestDuration(MCCTimes), "hrs"
-    # #print "Average duration is: ", mccSearchGoyens.convert_timedelta(mccSearchGoyens.averageMCCLength(MCCTimes))
-    # print "Average duration is: ", mccSearchGoyens.averageDuration(MCCTimes), "hrs"
-    # print "Average size is: ", mccSearchGoyens.averageFeatureSize(MCCList), "km^2" 
-    
-    # #print "Average duration is: ", mccSearchGoyens.convert_timedelta(mccSearchGoyens.averageMCCLength(MCCTimes))
-    # hist, bin_edges = mccSearchGoyens.commonFeatureSize(allMCSsList)
-    # print "Histogram is ", hist, bin_edges
-    # plt.bar(bin_edges[:-1], hist, width = 10)
-    # plt.xlim(min(bin_edges), max(bin_edges))
-    # plt.show()   
-
-    #some plots that work
-    # mccSearchGoyens.plotAccTRMM(MCCList)
-    # mccSearchGoyens.displayPrecip(MCCList)
-    # mccSearchGoyens.plotAccuInTimeRange('2009-09-01_00:00:00', '2009-09-01_23:00:00')
-    # mccSearchGoyens.displaySize(MCCList)
-    # mccSearchGoyens.displayPrecip(MCCList)
-    # mccSearchGoyens.plotHistograms(MCCList)
-    #sys.exit()
-    #
-    print ("-"*80)
-
-    # allCETRMMList = mccSearchGoyens.precipTotals(MCCList) #allMCSsList)
-    # print "********** findPrecipRate found"
-    # allCETRMMList = mccSearchGoyens.findPrecipRate(CEdirName,TRMMdirName)
-    # allCETRMMList = mccSearchGoyens.precipTotals(MCCList) #allMCSsList)
-    
-    # allCETRMMList = mccSearchGoyens.precipTotals(MCCList) #allMCSsList)
-    # print ("-"*80)
-    # print "allCETRMMList List has been aquired ", len(allCETRMMList), allCETRMMList
-    # print ("-"*80)
-    # # sys.exit()
-    
-main()
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/climate/blob/c1e22a93/mccsearch/code/mainProgTemp.py
----------------------------------------------------------------------
diff --git a/mccsearch/code/mainProgTemp.py b/mccsearch/code/mainProgTemp.py
deleted file mode 100644
index 9be65b5..0000000
--- a/mccsearch/code/mainProgTemp.py
+++ /dev/null
@@ -1,99 +0,0 @@
-'''
-# running the program
-'''
-
-import sys
-import networkx as nx
-import mccSearch
-import numpy as np
-import numpy.ma as ma
-import files
-import matplotlib.pyplot as plt
-import subprocess
-
-
-def main():
-    CEGraph = nx.DiGraph()
-    prunedGraph = nx.DiGraph()
-    MCCList =[]
-    MCSList=[]
-    MCSMCCNodesList =[]
-    allMCSsList =[]
-    allCETRMMList =[]
-
-    #for GrADs
-    subprocess.call('export DISPLAY=:0.0', shell=True)
-
-    mainDirStr= "/directory/to/where/to/store/outputs"
-    TRMMdirName = "/directory/to/the/TRMM/netCDF/files" 
-    CEoriDirName = "/directory/to/the/MERG/netCDF/files"
-
-    #for first time working with the raw MERG zipped files 
-    # mccSearch.preprocessingMERG("/Users/kimwhitehall/Documents/HU/research/DATA")
-    # ---------------------------------------------------------------------------------
-
-
-    #create main directory and file structure for storing intel
-    mccSearch.createMainDirectory(mainDirStr)
-    TRMMCEdirName = mainDirStr+'/TRMMnetcdfCEs'
-    CEdirName = mainDirStr+'/MERGnetcdfCEs'
-
-    # for doing some postprocessing with the clipped datasets instead of running the full
program, e.g.
-    # mccSearch.postProcessingNetCDF(3,CEoriDirName)
-    # mccSearch.postProcessingNetCDF(2)
-    # -------------------------------------------------------------------------------------------------
-
-    #let's go!
-    print "\n -------------- Read MERG Data ----------"
-    mergImgs, timeList = mccSearch.readMergData(CEoriDirName)
-    print ("-"*80)
-
-    print 'in main', len(mergImgs)
-    #print 'timeList', timeList
-    print 'TRMMdirName ', TRMMdirName
-    print "\n -------------- TESTING findCloudElements ----------"
-    CEGraph = mccSearch.findCloudElements(mergImgs,timeList,TRMMdirName)
-    #if the TRMMdirName wasnt entered for whatever reason, you can still get the TRMM data
this way
-    # CEGraph = mccSearch.findCloudElements(mergImgs,timeList)
-    # allCETRMMList=mccSearch.findPrecipRate(TRMMdirName,timeList)
-    # ----------------------------------------------------------------------------------------------
-    print ("-"*80)
-    print "number of nodes in CEGraph is: ", CEGraph.number_of_nodes()
-    print ("-"*80)    
-    print "\n -------------- TESTING findCloudClusters ----------"
-    prunedGraph = mccSearch.findCloudClusters(CEGraph)
-    print ("-"*80)
-    print "number of nodes in prunedGraph is: ", prunedGraph.number_of_nodes()
-    print ("-"*80)
-    #sys.exit()
-    print "\n -------------- TESTING findMCCs ----------"
-    MCCList,MCSList = mccSearch.findMCC(prunedGraph)
-    print ("-"*80)
-    print "MCC List has been acquired ", len(MCCList)
-    print "MCS List has been acquired ", len(MCSList)
-    print ("-"*80)
-    #now ready to perform various calculations/metrics
-    print "\n -------------- TESTING METRICS ----------"
-
-    #some calculations/metrics that work that work
-    # print "creating the MCC userfile ", mccSearch.createTextFile(MCCList,1)
-    # print "creating the MCS userfile ", mccSearch.createTextFile(MCSList,2)
-    # MCCTimes, tdelta = mccSearch.temporalAndAreaInfoMetric(MCCList)
-    # print "number of MCCs is: ", mccSearch.numberOfFeatures(MCCList)
-    # print "longest duration is: ", mccSearch.longestDuration(MCCTimes), "hrs"
-    # print "shortest duration is: ", mccSearch.shortestDuration(MCCTimes), "hrs"
-    # #print "Average duration is: ", mccSearch.convert_timedelta(mccSearch.averageMCCLength(MCCTimes))
-    # print "Average duration is: ", mccSearch.averageDuration(MCCTimes), "hrs"
-    # print "Average size is: ", mccSearch.averageFeatureSize(MCCList), "km^2" 
-    
-    #some plots that work
-    # mccSearch.plotAccTRMM(MCCList)
-    # mccSearch.displayPrecip(MCCList)
-    # mccSearch.plotAccuInTimeRange('2009-09-01_00:00:00', '2009-09-01_09:00:00')
-    # mccSearch.displaySize(MCCList)
-    # mccSearch.displayPrecip(MCCList)
-    # mccSearch.plotHistogram(MCCList)
-    #
-    print ("-"*80)
-    
-main()
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/climate/blob/c1e22a93/mccsearch/code/mainProgWorks.py
----------------------------------------------------------------------
diff --git a/mccsearch/code/mainProgWorks.py b/mccsearch/code/mainProgWorks.py
deleted file mode 100644
index f6eb55d..0000000
--- a/mccsearch/code/mainProgWorks.py
+++ /dev/null
@@ -1,124 +0,0 @@
-'''
-# running the program
-# Kim Whitehall Nov 2012
-# Last updated: 15 May 2013
-'''
-
-#import rcmes
-import sys
-import networkx as nx
-import mccSearch
-#import cloudclusters
-import numpy as np
-import numpy.ma as ma
-import files
-import matplotlib.pyplot as plt
-
-def main():
-    CEGraph = nx.DiGraph()
-    prunedGraph = nx.DiGraph()
-    MCCList =[]
-    MCSList=[]
-    MCSMCCNodesList =[]
-    allMCSsList =[]
-    allCETRMMList =[]
-    mainDirStr= "/Users/kimwhitehall/Documents/HU/research/mccsearch/caseStudy1"
-    #directories for the original data
-    TRMMdirName = "/Users/kimwhitehall/Documents/HU/research/DATA/TRMM" #compSciPaper/case2/TRMM"
-    CEoriDirName = "/Users/kimwhitehall/Documents/HU/research/DATA/mergNETCDF"
-    #allMCSsDict ={{}}
-
-    # mccSearch.preprocessingMERG("/Users/kimwhitehall/Documents/HU/research/DATA")
-    # sys.exit()
-
-    # # mccSearch.plotAccTRMM(TRMMCEdirName)
-    # sys.exit()
-
-    #create main directory and file structure for storing intel
-    mccSearch.createMainDirectory(mainDirStr)
-    TRMMCEdirName = mainDirStr+'/TRMMnetcdfCEs'
-    CEdirName = mainDirStr+'/MERGnetcdfCEs'
-
-    # #mccSearch.postProcessingNetCDF(3,CEoriDirName)
-    # mccSearch.postProcessingNetCDF(2)
-    # sys.exit()
-
-    #using merg data ***********
-    print "\n -------------- Read MERG Data ----------"
-    mergImgs, timeList = mccSearch.readMergData(CEoriDirName)
-    print ("-"*80)
-
-    print 'in main', len(mergImgs)
-    print "\n -------------- TESTING findCloudElements ----------"
-    CEGraph = mccSearch.findCloudElements(mergImgs,timeList,TRMMdirName)
-    #if the TRMMdirName isnt entered for what ever reason
-    # CEGraph = mccSearch.findCloudElements(mergImgs,timeList)
-    # allCETRMMList=mccSearch.findPrecipRate(TRMMdirName)
-    # sys.exit()
-    print ("-"*80)
-    print "number of nodes in CEGraph is: ", CEGraph.number_of_nodes()
-    print ("-"*80)    
-    print "\n -------------- TESTING findCloudClusters ----------"
-    prunedGraph = mccSearch.findCloudClusters(CEGraph)
-    print ("-"*80)
-    print "number of nodes in prunedGraph is: ", prunedGraph.number_of_nodes()
-    print ("-"*80)
-    #sys.exit()
-    print "\n -------------- TESTING findMCCs ----------"
-    MCCList,MCSList = mccSearch.findMCC(prunedGraph)
-    print ("-"*80)
-    print "MCC List has been acquired ", len(MCCList)
-    # for eachList in MCCList:
-    #     print eachList
-    #     for eachNode in eachList:
-    #         print eachNode, mccSearch.thisDict(eachNode)['nodeMCSIdentifier']
-    print "MCS List has been acquired ", len(MCSList)
-    # for eachList in MCSList:
-    #     print eachList
-    #     for eachNode in eachList:
-    #         print eachNode, mccSearch.thisDict(eachNode)['nodeMCSIdentifier']
-    print ("-"*80)
-    #sys.exit()
-    print "\n -------------- TESTING TRMM ----------"
-    #now ready to perform various calculations/metrics
-    print "\n -------------- TESTING METRICS ----------"
-    MCCTimes, tdelta = mccSearch.temporalAndAreaInfoMetric(MCCList)
-    print ("-"*80)
-    print "MCCTimes is: ", MCCTimes
-    print ("-"*80)
-    print "number of MCCs is: ", mccSearch.numberOfFeatures(MCCList)
-    print "longest duration is: ", mccSearch.longestDuration(MCCTimes), "hrs"
-    print "shortest duration is: ", mccSearch.shortestDuration(MCCTimes), "hrs"
-    #print "Average duration is: ", mccSearch.convert_timedelta(mccSearch.averageMCCLength(MCCTimes))
-    print "Average duration is: ", mccSearch.averageDuration(MCCTimes), "hrs"
-    print "Average size is: ", mccSearch.averageFeatureSize(MCCList), "km^2" 
-    
-    # #print "Average duration is: ", mccSearch.convert_timedelta(mccSearch.averageMCCLength(MCCTimes))
-    # hist, bin_edges = mccSearch.commonFeatureSize(allMCSsList)
-    # print "Histogram is ", hist, bin_edges
-    # plt.bar(bin_edges[:-1], hist, width = 10)
-    # plt.xlim(min(bin_edges), max(bin_edges))
-    # plt.show()   
-
-    #some plots that work
-    # mccSearch.plotAccTRMM(MCCList)
-    # mccSearch.displayPrecip(MCCList)
-    # mccSearch.plotAccuInTimeRange('2009-09-01_00:00:00', '2009-09-01_23:00:00')
-    # mccSearch.displaySize(MCCList)
-    # mccSearch.displayPrecip(MCCList)
-    # mccSearch.plotHistograms(MCCList)
-    #sys.exit()
-    #
-
-    # allCETRMMList = mccSearch.precipTotals(MCCList) #allMCSsList)
-    # print "********** findPrecipRate found"
-    # allCETRMMList = mccSearch.findPrecipRate(CEdirName,TRMMdirName)
-    # allCETRMMList = mccSearch.precipTotals(MCCList) #allMCSsList)
-    
-    # allCETRMMList = mccSearch.precipTotals(MCCList) #allMCSsList)
-    # print ("-"*80)
-    # print "allCETRMMList List has been aquired ", len(allCETRMMList), allCETRMMList
-    # print ("-"*80)
-    # # sys.exit()
-    
-main()
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/climate/blob/c1e22a93/mccsearch/code/mccSearch.pyc
----------------------------------------------------------------------
diff --git a/mccsearch/code/mccSearch.pyc b/mccsearch/code/mccSearch.pyc
deleted file mode 100644
index dc462d1..0000000
Binary files a/mccsearch/code/mccSearch.pyc and /dev/null differ


Mime
View raw message