| @@ -21,7 +21,7 @@ |
| import java.util.zip.ZipOutputStream; |
| |
| /** |
| -* Last Updated: 25-June-2015 |
| +* Last Updated: 20-August-2015 |
| * @author Tyler Wible |
| * @since 12-April-2012 |
| */ |
| @@ -38,7 +38,6 @@ |
| boolean USGSWellwqTF = true;//if true then water quality data will be downloaded for USGSwell stations |
| boolean STORETflowTF = false;//if true then flow data will be downloaded for STORET stations |
| boolean STORETwqTF = false;//if true then water quality data will be downloaded for STORET stations |
| - String NCDCelement = "GHCND";//NCDC download type |
| boolean CDWRflowTF = true;//if true then flow data will be downloaded for CDWR stations |
| boolean CDWRstageDischargeTF = true;//if true then stage-discharge data will be downloaded for CDWR stations |
| boolean NADPannualDataTrue = true;//if true then annual data will be downloaded for NADP stations |
| @@ -49,7 +48,6 @@ |
| "USGSWells\tUSGS\tn/a\t332432091031501\tD0016 WASHINGTON\t33.409005\t-91.0542732\tWashington County\tMISSISSIPPI\tUnited States\t8030209\t\t125\tft\tNGVD29\t\t\tn/a\tn/a\n" + |
| "SNOTEL\tSNOTEL\tn/a\t330\tBeaver Divide\t40.61666667\t-111.1\tWasatch\tUTAH\tUnited States\t\t\t8280\tfeet\t\t1978-10-01\t\tn/a\tn/a\n" + |
| "STORET\tNational Park Service Water Resources Division\t11NPSWRD\tCRLA_GSFRA_52\tPothole Creek (No.52 in GS report)\t42.936853\t-121.949314\tKLAMATH\tOREGON\t\t18010201\t--\t0\t\tNAD83\t\t\tn/a\tn/a\n" + |
| - //"NCDC\tNCDC\tn/a\t12002175\tMILLIKIN\t32.96666667\t-91.23333333\tEAST CARROLL\tLOUISIANA\tUNITED STATES\t\t\t-99999\tft\t\t1904-07-05\t1905-03-31\t166212\tn/a" + |
| "NADP\tNTN\tn/a\tCO21\tManitou\t39.1008\t-105.0933\tTeller\tCOLORADO\tUSA\t\t\t2362\tm\t\t1978-10-17\t\tn/a\tn/a\n" + |
| "CDWR\tCooperative Program of CDWR, NCWCD & LSPWCD\tn/a\tDEUDITCO\tDEUEL SNYDER CANAL\t40.282657\t-103.848246\t\tColorado\tUnited States\t\t\t\t\t\t2008-03-31\t2014-09-25\tn/a\tn/a";//the contents of a tab-delimited input file |
| |
| @@ -99,9 +97,6 @@ |
| public void setSTORETwqTF(boolean STORETwqTF) { |
| this.STORETwqTF = STORETwqTF; |
| } |
| - public void setNCDCelement(String NCDCelement) { |
| - this.NCDCelement = NCDCelement; |
| - } |
| public void setCDWRflowTF(boolean CDWRflowTF) { |
| this.CDWRflowTF = CDWRflowTF; |
| } |
| @@ -348,30 +343,6 @@ |
| //String end = (String) returnArray[3]; |
| fileNameList = writeOutputFile(textData, fileNameList, "SNOTEL_" + currentAttributes[index_state] + "_" + currentAttributes[index_station_id] + ".csv"); |
| |
| - }else if(currentAttributes[index_database].equalsIgnoreCase("NCDC")){ |
| - System.err.println("The NCDC downloader in this model does not currently work"); |
| -// //Make list of NCDC inputs |
| -// String[] inputs = new String[11]; |
| -// inputs[0] = mainFolder; //outputLocation |
| -// inputs[1] = "NCDC_" + currentAttributes[2] + "_AllData_" + currentAttributes[14] + "_" + currentAttributes[15] + ".csv"; //file name (NCDC_10000001_AllData.txt) |
| -// inputs[2] = currentAttributes[2]; //Site ID number |
| -// |
| -// //Check for "n/a" WBAN IDs and replace them with "" |
| -// inputs[3] = ""; //WBAN number |
| -// if(currentAttributes.length > 17 && !currentAttributes[17].equalsIgnoreCase("n/a")){ |
| -// inputs[3] = currentAttributes[17]; //WBAN number |
| -// } |
| -// inputs[4] = currentAttributes[16]; //COOP ID number |
| -// inputs[5] = currentAttributes[8]; //Country |
| -// inputs[6] = currentAttributes[14]; //begin date from attribute table |
| -// inputs[7] = currentAttributes[15]; //end date from attribute table |
| -// inputs[8] = beginDate; //begin date from GUI |
| -// inputs[9] = endDate; //end date from GUI |
| -// inputs[10] = NCDCelement; //what NCDC download is desired |
| -// //Download all NCDC data |
| -// String fileName = NCDC_download_Data.main(inputs); |
| -// fileNameList.add(fileName); |
| - |
| }else if(currentAttributes[index_database].equalsIgnoreCase("CDWR")){ |
| CDWR_Data cdwr_data = new CDWR_Data(); |
| //Download CDWR flow data |
| @@ -386,7 +357,7 @@ |
| textData.set(0, "There is no available flow data in the CDWR database for station '" + currentAttributes[index_station_id] + "' and the specified date range."); |
| textData.add("The CDWR database is sensitive to the begin date used, try specifying a later begin date"); |
| } |
| - fileNameList = writeOutputFile(textData, fileNameList, "CDWR_" + currentAttributes[index_station_id] + "_FlowData.csv"); |
| + fileNameList = writeOutputFile(textData, fileNameList, "CDWR_" + currentAttributes[index_station_id] + "_FlowData.txt"); |
| } |
| //Download CDWR stage-discharge data |
| if(CDWRstageDischargeTF){ |
| @@ -398,7 +369,7 @@ |
| textData.set(0, "There is no available flow data in the CDWR database for station '" + currentAttributes[index_station_id] + "' and the specified date range."); |
| textData.add("The CDWR database is sensitive to the begin date used, try specifying a later begin date"); |
| } |
| - fileNameList = writeOutputFile(textData, fileNameList, "CDWR_" + currentAttributes[index_station_id] + "_StageDischargeData.csv"); |
| + fileNameList = writeOutputFile(textData, fileNameList, "CDWR_" + currentAttributes[index_station_id] + "_StageDischargeData.txt"); |
| } |
| |
| }else if(currentAttributes[index_database].equalsIgnoreCase("USGSWells")){ |