| Displaying differences for changeset |
| @@ -309,26 +309,26 @@ |
| fileNameList = writeOutputFile(textData, fileNameList, "SNOTEL_" + currentAttributes[7] + "_" + currentAttributes[2] + ".csv"); |
| }else if(database.equalsIgnoreCase("NCDC")){ |
| - //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 |
| 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); |
| @@ -30,7 +30,7 @@ |
| model.setUSGSWellsWQtrue(getBooleanParam("USGSwells_wq_true")); |
| model.setSTORETflowTrue(getBooleanParam("STORET_flow_true")); |
| model.setSTORETwqTrue(getBooleanParam("STORET_wq_true")); |
| - model.setNCDCelement(getStringParam("NCDC_element")); |
| +// model.setNCDCelement(getStringParam("NCDC_element")); |
| model.setCDWRflowTrue(getBooleanParam("CDWR_flow_true")); |
| model.setCDWRstageDischargeTrue(getBooleanParam("CDWR_stagedischarge_true")); |
| @@ -4,7 +4,7 @@ |
| { |
| "name": "attribute_file", |
| "description": "the contents of a tab-delimited file as a string which contain the attributes of the stations to be searched for, including a header on the first line which is not read in as an example template", |
| - "value": "Database\tOrg\tStaID\tStaName\tLatitude\tLongitude\tCounty\tState\tCountry\tHUCNumber\tDrainArea\tElev\tElevUnits\tElevDatum\tBeginDate\tEndDate\tCoop_ID\tWBAN_ID\nUSGS\tUSGS\t07369654\tCoon Bayou Tributary near Tillar\t33.74982893\t-91.4115096\tDesha County\tARKANSAS\tUnited States\t8050002\t0.02\t145\tft\tNGVD29\t1995-03-05\t1996-12-16\tn/a\tn/a\nUSGSWells\tUSGS\t332432091031501\tD0016 WASHINGTON\t33.409005\t-91.0542732\tWashington County\tMISSISSIPPI\tUnited States\t8030209\t\t125\tft\tNGVD29\t\t\tn/a\tn/a\nSNOTEL\tSNOTEL\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\nSTORET\tNational Park Service Water Resources Division\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\nNCDC\tNCDC\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\nCDWR\tCooperative Program of CDWR, NCWCD & LSPWCD\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" |
| + "value": "Database\tOrg\tStaID\tStaName\tLatitude\tLongitude\tCounty\tState\tCountry\tHUCNumber\tDrainArea\tElev\tElevUnits\tElevDatum\tBeginDate\tEndDate\tCoop_ID\tWBAN_ID\nUSGS\tUSGS\t07369654\tCoon Bayou Tributary near Tillar\t33.74982893\t-91.4115096\tDesha County\tARKANSAS\tUnited States\t8050002\t0.02\t145\tft\tNGVD29\t1995-03-05\t1996-12-16\tn/a\tn/a\nUSGSWells\tUSGS\t332432091031501\tD0016 WASHINGTON\t33.409005\t-91.0542732\tWashington County\tMISSISSIPPI\tUnited States\t8030209\t\t125\tft\tNGVD29\t\t\tn/a\tn/a\nSNOTEL\tSNOTEL\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\nSTORET\tNational Park Service Water Resources Division\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\nCDWR\tCooperative Program of CDWR, NCWCD & LSPWCD\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" |
| }, |
| { |
| "name": "begin_date", |
| @@ -57,11 +57,6 @@ |
| "value": false |
| }, |
| { |
| - "name": "NCDC_element", |
| - "description": "The download option for NCDC stations ('GHCND' is a Daily GHCND download | 'GHCNDMS' is a Monthly Summary GHCND)", |
| - "value": "GHCND" |
| - }, |
| - { |
| "name": "CDWR_flow_true", |
| "description": "Whether flow data from CDWR streamflow stations is desired to be downloaded (True | False)", |
| "value": true |