http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a8965336/public/html/conditionalSampling2Var.html
----------------------------------------------------------------------
diff --git a/public/html/conditionalSampling2Var.html 
b/public/html/conditionalSampling2Var.html
deleted file mode 100644
index 16c2f91..0000000
--- a/public/html/conditionalSampling2Var.html
+++ /dev/null
@@ -1,785 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-
-  <!-- for Bootstrap -->
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" 
href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css";>
-  <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js";></script>
-  <script 
src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js";></script>
-
-  <!-- still needed? -->
-  <script src="js/jquery.flot.min.js"></script>
-  <script src="js/json2.js"></script>
-  <script src="js/xmisc.js"></script>
-
-  <!-- cmac related -->
-  <link rel="stylesheet" href="common.css">
-  <script src='js2/dataList2.js'></script>
-  <script src='js2/varList.js'></script>
-  <script src='js2/common.js'></script>
-
-  <title>Conditional Sampling 2 Var</title>
-
-  <script>
-
-    var Response = null;
-    var variable1 = "";
-    var variable2 = "";
-
-    var naValue = "-999999";
-
-    // called on load or reload
-    window.onload = function() {
-      var str1 = data_block_str(1, 3, "Physical Variable (sampled variable)", 
-          "range", "500,800");
-      document.getElementById("dataBlock1").innerHTML = str1;
-
-      str1 = data_block_str(2, 3, "Environmental Variable 1 (sampling 
variable)", 
-          "", "500");
-      document.getElementById("dataBlock2").innerHTML = str1;
-
-      str1 = data_block_str(3, 3, "Environmental Variable 2 (sampling 
variable)", 
-          "", "500");
-      document.getElementById("dataBlock3").innerHTML = str1;
-
-      put_data(1);
-      put_data(2);
-      put_data(3);
-      put_var(1);
-      put_var(2);
-      put_var(3);
-      select_var(1);
-      select_var(2);
-      select_var(3);
-      time_range3();
-      fillMonth();
-
-      disable_download_button();
-
-      select_all_months();
-      setDefault(1);
-      setDefault(2);
-    }
-
-    // disable customized input text boxes
-    function setDefault(ID)
-    {
-       // alert("in setDefault() ... ");
-       var x=document.getElementById("min"+ID);
-       var y=document.getElementById("max"+ID);
-       var z=document.getElementById("bins"+ID);
-       x.value = "N/A";
-       x.disabled=true;
-       y.value = "N/A";
-       y.disabled=true;
-       z.value = "N/A";
-       z.disabled=true;
-    }
-
-    // enable customized input text boxes
-    function setCustomized(ID)
-    {
-       // alert("in setCustomized() ... ");
-       var x=document.getElementById("min"+ID);
-       var y=document.getElementById("max"+ID);
-       var z=document.getElementById("bins"+ID);
-       x.value = "";
-       x.disabled=false;
-       y.value = "";
-       y.disabled=false;
-       z.value = "";
-       z.disabled=false;
-    }
-
-    $(document).ready(function(){
-
-      $("a").click(function(event){
-        alert("As you can see, the link no longer took you to jquery.com");
-        event.preventDefault();
-      });
-
-      $("#download_data").click(function(event) {
-        var durl = $("#data_url").val();
-        // alert(durl);
-        window.location.assign(durl);
-      });
-
-
-      $("#conditionalSamp").click(function(event) {
-        // alert('****** inside conditionalSamp()!');
-        Response = null;
-
-        // no data to download yet
-        disable_download_button();
-
-        // flag error if no month box is checked
-        if (no_month_check()) {
-           // $("#Response").html("<span style='color:red'>Error: please check 
at least one month.</span>");
-           $("#Response").html("Error: please check at least one month.");
-           $("#Image").html("");
-           return;
-        }
-
-        $("#Response").html("Calculating ...");
-        $("#data_url").html("Calculating ...");
-        $("#Image").html("");
-
-        // sample url: 
http://cmacws.jpl.nasa.gov:8090/svc/conditionalSampling?model1=ukmo_hadgem2-a&var1=ts&pres1=200&model2=ukmo_hadgem2-a&var2=clt&pres2=200&start_time=199001&end_time=199512&lon1=0&lon2=100&lat1=-29&lat2=29
-        // form url string
-        // var url = "http://cmacws.jpl.nasa.gov:8090/svc/conditionalSamp?";;
-        var url = "http://"; + window.location.hostname + 
":9002/svc/conditionalSampling2Var?";
-        // alert("url: " + url);
-
-        var d1 = $("#data1").val();
-        var model1 = d1.replace("/", "_");
-        model1 = model1.toLowerCase();
-
-        var arglist = "";
-        arglist = arglist.concat("model1=");
-        arglist = arglist.concat(model1);
-
-        // alert("arglist: " + arglist);
-
-        var variable1 = $("#var1").val();
-        arglist = arglist.concat("&var1=");
-        arglist = arglist.concat(variable1);
-
-        // alert("arglist: " + arglist);
-
-
-        var t0 = $("#t0").val();
-        var t1 = $("#t1").val();
-
-        t0 = t0.replace("-", "");
-        t1 = t1.replace("-", "");
-
-        arglist = arglist.concat("&start_time=");
-        arglist = arglist.concat(t0);
-
-        arglist = arglist.concat("&end_time=");
-        arglist = arglist.concat(t1);
-
-        var lon0 = $("#lon0").val();
-        var lon1 = $("#lon1").val();
-        var lat0 = $("#lat0").val();
-        var lat1 = $("#lat1").val();
-
-        arglist = arglist.concat("&lon1=");
-        arglist = arglist.concat(lon0);
-
-        arglist = arglist.concat("&lon2=");
-        arglist = arglist.concat(lon1);
-
-        arglist = arglist.concat("&lat1=");
-        arglist = arglist.concat(lat0);
-
-        arglist = arglist.concat("&lat2=");
-        arglist = arglist.concat(lat1);
-
-        // alert("arglist: " + arglist);
-
-        var press_range = $("#pres1").val();
-        // alert("press_range: " + press_range);
-
-        var pres12 = parse_pres(press_range);
-
-        var pres1;
-        var pres2;
-        if (pres12 === naValue) {
-          pres1 = naValue;
-          pres2 = naValue;
-        } else {
-          split12 = pres12.split(",");
-          if (split12.length != 2) {
-            alert("pressure level range needs to be two values separated by 
comma.");
-            return; 
-          } else {
-            pres1 = split12[0];
-            pres2 = split12[1];
-        
-            // when variable is the 3D Ocean Salinity or Ocean Temperature
-            if (variable1 == 'ot' || variable1 == 'os') {
-              pres1 = pres1 * 10000;  // convert from dbar on GUI
-              pres2 = pres2 * 10000;  // convert from dbar on GUI
-            } 
-            // when variable2 is 3D atmosphere var
-            else {
-              pres1 = pres1 * 100;  // convert from hPa on GUI
-              pres2 = pres2 * 100;  // convert from hPa on GUI
-            }
-          }
-        }
-        //alert("pres1, pres2: " + pres1 + ", " + pres2);
-
-        arglist = arglist.concat("&pres1=");
-        arglist = arglist.concat(pres1);
-        arglist = arglist.concat("&pres2=");
-        arglist = arglist.concat(pres2);
-
-        // alert("arglist: " + arglist);
-
-        var month_str = getMonthStr();
-        arglist = arglist.concat("&months=");
-        arglist = arglist.concat(month_str);
-
-        // alert("arglist: " + arglist);
-
-
-        var d2 = $("#data2").val();
-        var model2 = d2.replace("/", "_");
-        model2 = model2.toLowerCase();
-
-        arglist = arglist.concat("&model2=");
-        arglist = arglist.concat(model2);
-
-        // alert("arglist: " + arglist);
-
-        var variable2 = $("#var2").val();
-        arglist = arglist.concat("&var2=");
-        arglist = arglist.concat(variable2);
-
-        var d3 = $("#data3").val();
-        var model3 = d3.replace("/", "_");
-        model3 = model3.toLowerCase();
-
-        arglist = arglist.concat("&model3=");
-        arglist = arglist.concat(model3);
-
-        // alert("arglist: " + arglist);
-
-        var variable3 = $("#var3").val();
-        arglist = arglist.concat("&var3=");
-        arglist = arglist.concat(variable3);
-
-        // alert("arglist: " + arglist);
-
-        var plev1 = $("#pres2").val();
-        plev1 = parse_pres(plev1);
-
-        if (plev1>0) {
-          // when variable is the 3D Ocean Salinity or Ocean Temperature
-          if (variable2 == 'ot' || variable2 == 'os') {
-            plev1 = plev1 * 10000;  // convert from dbar on GUI
-          } 
-          // when variable2 is 3D atmosphere var
-          else {
-            plev1 = plev1 * 100;  // convert from hPa on GUI
-          }
-        }
-
-        arglist = arglist.concat("&env_var_plev1=");
-        arglist = arglist.concat(plev1);
-
-        var plev2 = $("#pres3").val();
-        plev2 = parse_pres(plev2);
-        if (plev2>0) {
-          // when variable is the 3D Ocean Salinity or Ocean Temperature
-          if (variable3 == 'ot' || variable3 == 'os') {
-            plev2 = plev2 * 10000;  // convert from dbar on GUI
-          } 
-          // when variable2 is 3D atmosphere var
-          else {
-            plev2 = plev2 * 100;  // convert from hPa on GUI
-          }
-        }
-
-        arglist = arglist.concat("&env_var_plev2=");
-        arglist = arglist.concat(plev2);
-
-        // alert("arglist: " + arglist);
-
-        var binstate1 = document.getElementById('radioDef1').checked;
-
-        var binMin1, binMax1, numBins1;
-
-        if (binstate1 == true) { // default
-          binMin1 = naValue;
-          binMax1 = naValue;
-          numBins1 = naValue;
-        }
-        else { // customized
-          binMin1 = $("#min1").val();
-          binMax1 = $("#max1").val();
-          numBins1 = $("#bins1").val();
-        }
-
-        arglist = arglist.concat("&bin_min1=");
-        arglist = arglist.concat(binMin1);
-        arglist = arglist.concat("&bin_max1=");
-        arglist = arglist.concat(binMax1);
-        arglist = arglist.concat("&bin_n1=");
-        arglist = arglist.concat(numBins1);
-
-        var binstate2 = document.getElementById('radioDef2').checked;
-
-        var binMin2, binMax2, numBins2;
-
-        if (binstate2 == true) { // default
-          binMin2 = naValue;
-          binMax2 = naValue;
-          numBins2 = naValue;
-        }
-        else { // customized
-          binMin2 = $("#min2").val();
-          binMax2 = $("#max2").val();
-          numBins2 = $("#bins2").val();
-        }
-
-        arglist = arglist.concat("&bin_min2=");
-        arglist = arglist.concat(binMin2);
-        arglist = arglist.concat("&bin_max2=");
-        arglist = arglist.concat(binMax2);
-        arglist = arglist.concat("&bin_n2=");
-        arglist = arglist.concat(numBins2);
-
-        // alert("arglist: " + arglist);
-
-        var xstate = document.getElementById('radioXLin').checked;
-        var xvalue;
-
-        if (xstate == true)
-          xvalue = 0;
-        else
-          xvalue = 1;
-
-        // alert("xvalue: " + xvalue);
-
-        var ystate = document.getElementById('radioYLin').checked;
-        var yvalue;
-
-        if (ystate == true)
-          yvalue = 0;
-        else
-          yvalue = 1;
-
-        // alert("yvalue: " + yvalue);
-
-        var zstate = document.getElementById('radioZLin').checked;
-        var zvalue;
-
-        if (zstate == true)
-          zvalue = 0;
-        else
-          zvalue = 1;
-
-        // alert("zvalue: " + zvalue);
-
-        var dispOpt;
-        dispOpt = xvalue*1 + yvalue*2 + zvalue*4;
-        // alert("dispOpt: " + dispOpt);
-        var dispOptString = dispOpt.toString();
-
-        arglist = arglist.concat("&displayOpt=");
-        arglist = arglist.concat(dispOptString);
-
-        var purpose = $("#purpose").val();
-        arglist = arglist.concat("&purpose=");
-        arglist = arglist.concat(purpose);
-
-        // alert("arglist: " + arglist);
-
-        // url = url + encodeURIComponent(arglist);
-        url = url + encodeURI(arglist);
-        // url = url + arglist;
-        // alert("url: " + url);
-
-        var urlTimeBounds = "http://"; + window.location.hostname + 
":9002/svc/two_time_bounds?";
-        var arglistTB = "";
-        arglistTB = arglistTB.concat("serviceType=");
-        arglistTB = arglistTB.concat("1");
-        arglistTB = arglistTB.concat("&source1=");
-        arglistTB = arglistTB.concat(d1);
-        arglistTB = arglistTB.concat("&var1=");
-        arglistTB = arglistTB.concat(variable1);
-        arglistTB = arglistTB.concat("&source2=");
-        arglistTB = arglistTB.concat(d2);
-        arglistTB = arglistTB.concat("&var2=");
-        arglistTB = arglistTB.concat(variable2);
-        urlTimeBounds = urlTimeBounds + encodeURI(arglistTB);
-        // alert("urlTimeBounds: " + urlTimeBounds);
-
-        $.ajax({
-            type: "GET",
-            url: urlTimeBounds,
-            dataType: "json",
-            data: null,
-            success: function(data, textStatus, xhr) {
-                Response = data;
-                // alert("data: " + data);
-                if (data.success == false) {
-                    // alert(data.error);
-                    Response = null;
-                    var text = JSON.stringify(data, null, 4);
-                    text = "Error in backend: <br>" + text; 
-                    $("#Response").html(text);
-                    $("#data_url").html(text);
-                    return;
-                }
-                var text = JSON.stringify(data, null, 4);
-                // alert("text: " + text);
-                // $("#Response").html("<pre>"+text+"</pre>");
-                // $("#Response").html(text);
-
-                var tb1 = data.time_bounds1;
-                var bds1 = String(tb1).split(",");
-                // alert("tb1: " + tb1);
-                // alert("bds1: " + bds1);
-                var lowerT1 = parseInt(bds1[0]);
-                // alert("inside ajax, lowerT1: " + lowerT1);
-                var upperT1 = parseInt(bds1[1]);
-                // alert("upperT1: " + upperT1);
-
-                var tb2 = data.time_bounds2;
-                var bds2 = String(tb2).split(",");
-                // alert("tb2: " + tb2);
-                // alert("bds2: " + bds2);
-                var lowerT2 = parseInt(bds2[0]);
-                // alert("inside ajax, lowerT2: " + lowerT2);
-                var upperT2 = parseInt(bds2[1]);
-                // alert("upperT2: " + upperT2);
-
-                var t0I = parseInt(t0);
-                var t1I = parseInt(t1);
-                // alert("t0: " + t0I);
-                // alert("t1: " + t1I);
-
-                var lowerT, upperT;
-                // compute the intersection of the two data bounds
-
-                if (lowerT1 == 0  || upperT1 == 0){ // no data-1
-                  alert("We do not have data for the data-1 source and 
variable configuration.");
-                  return;
-                }
-                else if (lowerT2 == 0  || upperT2 == 0){ // no data-2
-                  alert("We do not have data for the data-2 source and 
variable configuration.");
-                  return;
-                }
-                else if (lowerT2 > upperT1 || lowerT1 > upperT2) { // no 
intersection
-                  alert("The two data sets/vars do not have a common time 
range.");
-                  return;
-                }
-                else { // compute intersection
-                  if (lowerT1 > lowerT2) { // pick bigger lower time bound
-                    lowerT = lowerT1;
-                  }
-                  else {
-                    lowerT = lowerT2;
-                  }
-
-                  if (upperT1 > upperT2) { // pick smaller upper time bound
-                    upperT = upperT2;
-                  }
-                  else {
-                    upperT = upperT1;
-                  }
-                }
-                // alert("lowerT: " + lowerT);
-                // alert("upperT: " + upperT);
-
-                if (t0I < lowerT && t1I < lowerT ||
-                    t0I > upperT && t1I > upperT) {
-                  alert("We do not have data that span your time range. Try 
the range inside ["+lowerT+", "+upperT+"].");
-                  return;
-                }
-
-                if (t0I < lowerT && t1I <= upperT) {
-                  alert("Your start year-month is out of bound. It has to be 
in or later than " + lowerT +
-                        ". We will use the range ["+lowerT+", "+t1I+"] for 
you.");
-                }
-
-                if (t1I > upperT && t0I >= lowerT) {
-                  alert("Your end year-month is out of bound. It has to be in 
or earlier than " + upperT +
-                        ". We will use the range ["+t0I+", "+upperT+"] for 
you.");
-                }
-
-                if (t0I < lowerT && t1I > upperT ) {
-                  alert("Both of your start and end year-months are out of 
bounds. They have to be in or earlier than " + upperT +
-                        ", and in or later than " + lowerT + ". We will use 
the range ["+lowerT+", "+upperT+"] for you.");
-                }
-            },
-            error: function(xhr, textStatus, errorThrown) {
-               $("#Response").html("error!");
-               $("#data_url").html("error!");
-                // alert("xhr.status: "+xhr.status);
-                // alert("error status: "+textStatus);
-            },
-            complete: function(xhr, textStatus) {
-                //alert("complete status: "+textStatus);
-            }
-        });
-
-
-        $.ajax({
-            type: "GET",
-            url: url,
-            dataType: "json",
-            data: null,
-            success: function(data, textStatus, xhr) {
-                Response = data;
-                // alert("data: " + data);
-                if (data.success == false) {
-                    // alert(data.error);
-                    Response = null;
-                    var text = JSON.stringify(data, null, 4);
-                    text = "Error in backend: <br>" + text; 
-                    // $("#Response").html("<span style='color:red'>" + text + 
"</span>");
-                    $("#Response").html(text);
-                    $("#data_url").html(text);
-                    return;
-                }
-                var text = JSON.stringify(data, null, 4);
-                // alert(text);
-                // $("#Response").html("<pre>"+text+"</pre>");
-                $("#Response").html(text);
-
-                var html = "<img src='"+data.url+"' width='820'/>";
-                // alert(html);
-                $("#Image").html(html);
-
-                // post dataUrl to textarea and enable download button
-                $("#data_url").html(data.dataUrl);
-                enable_download_button();
-            },
-            error: function(xhr, textStatus, errorThrown) {
-                $("#Response").html("error!");
-                $("#data_url").html("error!");
-                // alert("xhr.status: "+xhr.status);
-                // alert("error status: "+textStatus);
-            },
-            complete: function(xhr, textStatus) {
-                //alert("complete status: "+textStatus);
-            }
-        });
-
-      });
-
-    });
-    
-  </script>
-
-</head>
-
-<body>
-<div class="container-fluid">
-<div class="row center1">
-<div class="col-sm-8 col-sm-offset-2 col-xs-12 color-head">
-<h3>Service: Conditional Sampling with Two Variables</h3>
-This service sorts one variable called sampled variable by the
-values of two variables called sampling variables and displays the
-averaged value of the sampled variable in color as a function of the
-bin value of the two sampling variables in X-Y axis. There are
-overlaid contours which show the number of samples in each of the 
-two sampling variable bin.
-</div> <!-- col-sm -->
-<div class="col-sm-offset-2">
-</div> <!-- col-sm -->
-</div> <!-- row center1 -->
-
-<div class="row level0">
-<div class="col-sm-12 col-lg-12 level0 color0">
-  <div id="dataBlock1">
-  </div>
-</div> <!-- col level0 -->
-
-<div class="col-sm-12 col-lg-12 level0 color1">
-  <div id="dataBlock2">
-  </div>
-
-  <div class="row row1">
-    <div class="col-sm-4 right1">
-      sampling variable binning specification:
-    </div>
-    <div class="col-sm-8 left1">
-      default: <input onclick="setDefault(1)" type="radio" name="default1" 
value="" id="radioDef1" checked>
-      customized: <input onclick="setCustomized(1)" type="radio" 
name="default1" value="" id="radioCus1">
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col-sm-4 right1">
-    </div>
-    <div class="col-sm-8 left1">
-      Min: <input id="min1" value="" alt="" size=3/> 
-      Max: <input id="max1" value="" alt="" size=3/>
-      number of bins: <input id="bins1" value="" alt="" size=3/>
-    </div>
-  </div>
-</div> <!-- col level0 -->
-
-<div class="col-sm-12 col-lg-12 level0 color0">
-  <div id="dataBlock3">
-  </div>
-
-  <div class="row">
-    <div class="col-sm-4 right1">
-      sampling variable binning specification:
-    </div>
-    <div class="col-sm-8 left1">
-      default: <input onclick="setDefault(2)" type="radio" name="default2" 
value="" id="radioDef2" checked>
-      customized: <input onclick="setCustomized(2)" type="radio" 
name="default2" value="" id="radioCus2">
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col-sm-4 right1">
-    </div>
-    <div class="col-sm-8 left1">
-      Min: <input id="min2" value="" alt="" size=3/> 
-      Max: <input id="max2" value="" alt="" size=3/>
-      number of bins: <input id="bins2" value="" alt="" size=3/>
-    </div>
-  </div>
-</div> <!-- col level0 -->
-
-</div> <!-- row level0 -->
-
-<div class="color3">
-<div class="row center1 subtitle1" >
-Data Subsetting
-</div> <!-- row -->
-<div class="row">
-  <div class="col-sm-4 right1">
-    <div id="monthSelect0"></div>
-  </div>
-  <div class="col-sm-8 left1">
-    <div id="monthSelect"></div>
-  </div>
-</div> <!-- row -->
-
-<div class="row">
-  <div class="col-sm-4 right1">
-    <div id=startYear>start year-month:</div>
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="t0" value="2004-01" alt="start"/>
-  </div>
-
-  <div class="col-sm-4 right1">
-    <div id=endYear>end year-month:</div>
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="t1" value="2004-12" alt="start"/>
-  </div>
-</div> <!-- row -->
-
-<div class="row">
-  <div class="col-sm-4 right1">
-    start lon (deg):
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="lon0" value="0"/>
-  </div>
-  <div class="col-sm-4 right1">
-    end lon (deg):
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="lon1" value="360"/>
-  </div>
-</div> <!-- row -->
-
-<div class="row">
-  <div class="col-sm-4 right1">
-    start lat (deg):
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="lat0" value="-90"/>
-  </div>
-  <div class="col-sm-4 right1">
-    end lat (deg):
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="lat1" value="90"/>
-  </div>
-</div> <!-- row -->
-</div> <!-- color3 -->
-
-<div class="color2">
-<div class="row">
-  <div class="col-sm-12 center1 subtitle1">
-    Display Options:
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-sm-6 right1">
-        X-axis (sampling variable) scale: 
-  </div>
-  <div class="col-sm-6 left1">
-        <form><input type="radio" name="scale1" value="linear" id="radioXLin" 
checked>linear
-        <input type="radio" name="scale1" value="logarithmic" 
id="radioXLog">logarithmic
-        </form>
-  </div>
-</div> <!-- row -->
-
-<div class="row">
-  <div class="col-sm-6 right1">
-        y-axis (sampling variable or pressure) scale:
-  </div>
-  <div class="col-sm-6 left1">
-        <form><input type="radio" name="scale1" value="linear" id="radioYLin" 
checked>linear
-        <input type="radio" name="scale1" value="logarithmic" 
id="radioYLog">logarithmic
-        </form>
-  </div>
-</div> <!-- row -->
-
-<div class="row">
-  <div class="col-sm-6 right1">
-        z-axis (color) scale: 
-  </div>
-  <div class="col-sm-6 left1">
-        <form><input type="radio" name="scale1" value="linear" id="radioZLin" 
checked>linear
-        <input type="radio" name="scale1" value="logarithmic" 
id="radioZLog">logarithmic
-        </form>
-  </div>
-</div> <!-- row -->
-</div> <!-- color2 -->
-
-<div class="color3">
-<div class="row">
-  <div class="col-sm-4 right1">
-    Execution purpose:
-  </div> <!-- col -->
-  <div class="col-sm-8 left1">
-    <form>
-    <textarea name="purpose" id="purpose" rows="4" cols="50"> </textarea>
-    </form>
-  </div> <!-- col -->
-</div> <!-- row -->
-</div> <!-- color2 -->
-
-<div class="color4">
-<div class="row ">
-  <div class="col-sm-6 center1">
-    <input id="conditionalSamp" type="submit" value="            Get  Plot     
       " style="height:28px"/>
-  </div>
-  <div class="col-sm-6 center1">
-    <form>
-      <input id="download_data" type="button" value="Download Data" 
style="height:28px"/>
-    </form>
-  </div>
-</div> <!-- row -->
-</div> <!-- color -->
-
-<div class="row" center1>
-  <div class="col-sm-12 center1">
-    <div id="Image">Image Here</div>
-  </div>
-</div> <!-- row -->
-
-<div class="row" >
-  <div class="col-sm-12 center1">
-    <textarea readonly id="data_url" cols="150" rows="2">Data URL 
Here</textarea>
-  </div>
-</div> <!-- row -->
-
-<div class="row" center1>
-  <div class="col-sm-12 center1">
-    <textarea id="Response" cols="150" rows="6">Service Response Text 
Here</textarea>
-  </div>
-</div> <!-- row -->
-
-</div> <!-- container -->
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a8965336/public/html/correlationMap.html
----------------------------------------------------------------------
diff --git a/public/html/correlationMap.html b/public/html/correlationMap.html
deleted file mode 100644
index 4177712..0000000
--- a/public/html/correlationMap.html
+++ /dev/null
@@ -1,493 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-
-  <!-- for Bootstrap -->
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" 
href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css";>
-  <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js";></script>
-  <script 
src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js";></script>
-
-  <!-- still needed? -->
-  <script src="js/jquery.flot.min.js"></script>
-  <script src="js/json2.js"></script>
-  <script src="js/xmisc.js"></script>
-
-  <!-- cmac related -->
-  <link rel="stylesheet" href="common.css">
-  <script src='js2/dataList2.js'></script>
-  <script src='js2/varList.js'></script>
-  <script src='js2/common.js'></script>
-
-  <title>correlationMap Service</title>
-
-  <script>
-
-    var Response = null;
-    var variable1 = "";
-    var variable2 = "";
-
-    var naValue = "-999999";
-
-    // called on load or reload
-    window.onload = function() {
-      var str1 = data_block_str(1, 2, "Variable 1", 
-          "", "500");
-      document.getElementById("dataBlock1").innerHTML = str1;
-
-      str1 = data_block_str(2, 2, "Variable 2", 
-          "", "500");
-      document.getElementById("dataBlock2").innerHTML = str1;
-
-      put_data(1);
-      put_data(2);
-      put_var(1);
-      put_var(2);
-      select_var(1);
-      select_var(2);
-      time_range2();
-      //fillMonth();
-
-      disable_download_button();
-
-      // select_all_months();
-    }
-
-    $(document).ready(function(){
-
-      $("a").click(function(event){
-        alert("As you can see, the link no longer took you to jquery.com");
-        event.preventDefault();
-      });
-
-
-      $("#download_data").click(function(event) {
-        var durl = $("#data_url").val();
-        // alert(durl);
-        window.location.assign(durl);
-      });
-
-
-      $("#correlationMap").click(function(event) {
-        // alert('****** inside correlationMap()!');
-        Response = null;
-
-        // no data to download yet
-        disable_download_button();
-
-        $("#Response").html("Calculating ...");
-        $("#data_url").html("Calculating ...");
-        $("#Image").html("");
-
-        // sample url: 
http://cmacws.jpl.nasa.gov:8090/svc/scatterPlot2V?model1=ukmo_hadgem2-a&var1=ts&pres1=200&model2=ukmo_hadgem2-a&var2=clt&pres2=200&start_time=199001&end_time=199512&lon1=0&lon2=100&lat1=-29&lat2=29
-        // form url string
-        // var url = "http://cmacws.jpl.nasa.gov:8090/svc/scatterPlot2V?";;
-        var url = "http://"; + window.location.hostname + 
":9002/svc/correlationMap?";
-        // alert("url: " + url);
-
-        var d1 = $("#data1").val();
-        var model1 = d1.replace("/", "_");
-        model1 = model1.toLowerCase();
-
-        var arglist = "";
-        arglist = arglist.concat("model1=");
-        arglist = arglist.concat(model1);
-
-        // alert("arglist: " + arglist);
-
-        var variable1 = $("#var1").val();
-        arglist = arglist.concat("&var1=");
-        arglist = arglist.concat(variable1);
-
-        // alert("arglist: " + arglist);
-
-        var pres1 = $("#pres1").val();
-        if (isNaN(Number(pres1))) { pres1 = "-9999"; }
-        arglist = arglist.concat("&pres1=");
-        arglist = arglist.concat(pres1);
-
-        var d2 = $("#data2").val();
-        var model2 = d2.replace("/", "_");
-        model2 = model2.toLowerCase();
-
-        arglist = arglist.concat("&model2=");
-        arglist = arglist.concat(model2);
-
-        // alert("arglist: " + arglist);
-
-        var variable2 = $("#var2").val();
-        arglist = arglist.concat("&var2=");
-        arglist = arglist.concat(variable2);
-
-        // alert("arglist: " + arglist);
-
-        var pres2 = $("#pres2").val();
-        if (isNaN(Number(pres2))) { pres2 = "-9999"; }
-        arglist = arglist.concat("&pres2=");
-        arglist = arglist.concat(pres2);
-
-        var laggedTime = $("#laggedTime").val();
-        arglist = arglist.concat("&laggedTime=");
-        arglist = arglist.concat(laggedTime);
-
-        var t0 = $("#t0").val();
-        var t1 = $("#t1").val();
-
-        t0 = t0.replace("-", "");
-        t1 = t1.replace("-", "");
-
-        arglist = arglist.concat("&start_time=");
-        arglist = arglist.concat(t0);
-
-        arglist = arglist.concat("&end_time=");
-        arglist = arglist.concat(t1);
-
-        // alert("arglist: " + arglist);
-
-        var lon0 = $("#lon0").val();
-        var lon1 = $("#lon1").val();
-        var lat0 = $("#lat0").val();
-        var lat1 = $("#lat1").val();
-
-        arglist = arglist.concat("&lon1=");
-        arglist = arglist.concat(lon0);
-
-        arglist = arglist.concat("&lon2=");
-        arglist = arglist.concat(lon1);
-
-        arglist = arglist.concat("&lat1=");
-        arglist = arglist.concat(lat0);
-
-        arglist = arglist.concat("&lat2=");
-        arglist = arglist.concat(lat1);
-
-        // alert("arglist: " + arglist);
-
-        var purpose = $("#purpose").val();
-        arglist = arglist.concat("&purpose=");
-        arglist = arglist.concat(purpose);
-
-        // url = url + encodeURIComponent(arglist);
-        url = url + encodeURI(arglist);
-        // url = url + arglist;
-        // alert("url: " + url);
-
-        var urlTimeBounds = "http://"; + window.location.hostname + 
":9002/svc/two_time_bounds?";
-        var arglistTB = "";
-        arglistTB = arglistTB.concat("serviceType=");
-        arglistTB = arglistTB.concat("2");
-        arglistTB = arglistTB.concat("&source1=");
-        arglistTB = arglistTB.concat(d1);
-        arglistTB = arglistTB.concat("&var1=");
-        arglistTB = arglistTB.concat(variable1);
-        arglistTB = arglistTB.concat("&source2=");
-        arglistTB = arglistTB.concat(d2);
-        arglistTB = arglistTB.concat("&var2=");
-        arglistTB = arglistTB.concat(variable2);
-        urlTimeBounds = urlTimeBounds + encodeURI(arglistTB);
-        // alert("urlTimeBounds: " + urlTimeBounds);
-
-        $.ajax({
-            type: "GET",
-            url: urlTimeBounds,
-            dataType: "json",
-            data: null,
-            success: function(data, textStatus, xhr) {
-                Response = data;
-                // alert("data: " + data);
-                if (data.success == false) {
-                    // alert(data.error);
-                    Response = null;
-                    var text = JSON.stringify(data, null, 4);
-                    text = "Error in backend: <br>" + text; 
-                    $("#Response").html(text);
-                    $("#data_url").html(text);
-                    return;
-                }
-                var text = JSON.stringify(data, null, 4);
-                // alert("text: " + text);
-                // $("#Response").html("<pre>"+text+"</pre>");
-                // $("#Response").html(text);
-
-                var tb1 = data.time_bounds1;
-                var bds1 = String(tb1).split(",");
-                // alert("tb1: " + tb1);
-                // alert("bds1: " + bds1);
-                var lowerT1 = parseInt(bds1[0]);
-                // alert("inside ajax, lowerT1: " + lowerT1);
-                var upperT1 = parseInt(bds1[1]);
-                // alert("upperT1: " + upperT1);
-
-                var tb2 = data.time_bounds2;
-                var bds2 = String(tb2).split(",");
-                // alert("tb2: " + tb2);
-                // alert("bds2: " + bds2);
-                var lowerT2 = parseInt(bds2[0]);
-                // alert("inside ajax, lowerT2: " + lowerT2);
-                var upperT2 = parseInt(bds2[1]);
-                // alert("upperT2: " + upperT2);
-
-                var t0I = parseInt(t0);
-                var t1I = parseInt(t1);
-                // alert("t0: " + t0I);
-                // alert("t1: " + t1I);
-
-                var lowerT, upperT;
-                // compute the intersection of the two data bounds
-                if (lowerT1 == 0  || upperT1 == 0){ // no data-1
-                  alert("We do not have data for the data-1 source and 
variable configuration.");
-                  alert(urlTimeBounds);
-                  return;
-                }
-                else if (lowerT2 == 0  || upperT2 == 0){ // no data-2
-                  alert("We do not have data for the data-2 source and 
variable configuration.");
-                  return;
-                }
-                else if (lowerT2 > upperT1 || lowerT1 > upperT2) { // no 
intersection
-                  alert("The two data sets/vars do not have a common time 
range.");
-                  return;
-                }
-                else { // compute intersection
-                  if (lowerT1 > lowerT2) { // pick bigger lower time bound
-                    lowerT = lowerT1;
-                  }
-                  else {
-                    lowerT = lowerT2;
-                  }
-
-                  if (upperT1 > upperT2) { // pick smaller upper time bound
-                    upperT = upperT2;
-                  }
-                  else {
-                    upperT = upperT1;
-                  }
-                }
-                // alert("lowerT: " + lowerT);
-                // alert("upperT: " + upperT);
-
-                if (t0I < lowerT && t1I < lowerT ||
-                    t0I > upperT && t1I > upperT) {
-                  alert("We do not have data that span your time range. Try 
the range inside ["+lowerT+", "+upperT+"].");
-                  return;
-                }
-
-                if (t0I < lowerT && t1I <= upperT) {
-                  alert("Your start year-month is out of bound. It has to be 
in or later than " + lowerT +
-                        ". We will use the range ["+lowerT+", "+t1I+"] for 
you.");
-                }
-
-                if (t1I > upperT && t0I >= lowerT) {
-                  alert("Your end year-month is out of bound. It has to be in 
or earlier than " + upperT +
-                        ". We will use the range ["+t0I+", "+upperT+"] for 
you.");
-                }
-
-                if (t0I < lowerT && t1I > upperT ) {
-                  alert("Both of your start and end year-months are out of 
bounds. They have to be in or earlier than " + upperT +
-                        ", and in or later than " + lowerT + ". We will use 
the range ["+lowerT+", "+upperT+"] for you.");
-                }
-            },
-            error: function(xhr, textStatus, errorThrown) {
-               $("#Response").html("error!");
-               $("#data_url").html("error!");
-                // alert("xhr.status: "+xhr.status);
-                // alert("error status: "+textStatus);
-            },
-            complete: function(xhr, textStatus) {
-                //alert("complete status: "+textStatus);
-            }
-        });
-
-
-        $.ajax({
-            type: "GET",
-            url: url,
-            dataType: "json",
-            data: null,
-            success: function(data, textStatus, xhr) {
-                Response = data;
-                // alert("data: " + data);
-                // alert(url);
-                if (data.success == false) {
-                    // alert(data.error);
-                    Response = null;
-                    var text = JSON.stringify(data, null, 4);
-
-                    if (text.indexOf("No Data") != -1) {
-                      $("#Image").html("No Data");
-                      $("#Response").html("No Data");
-                      $("#data_url").html("No Data");
-                      return;
-                    }
-
-                    text = "Error in backend: <br>" + text; 
-                    // $("#Response").html("<span style='color:red'>" + text + 
"</span>");
-                    $("#Response").html(text);
-                    $("#data_url").html(text);
-
-                    return;
-                }
-                var text = JSON.stringify(data, null, 4);
-                // alert(text);
-                // $("#Response").html("<pre>"+text+"</pre>");
-                $("#Response").html(text);
-
-                var html = "<img src='" + data.url + "?" + new 
Date().getTime() + "' width='820'/>";
-                // alert(html);
-                $("#Image").html(html);
-
-                // post dataUrl to textarea and enable download button
-                $("#data_url").html(data.dataUrl);
-                enable_download_button();
-            },
-            error: function(xhr, textStatus, errorThrown) {
-                $("#Response").html("error!");
-                $("#data_url").html("error!");
-                // alert("xhr.status: "+xhr.status);
-                // alert("error status: "+textStatus);
-            },
-            complete: function(xhr, textStatus) {
-                //alert("complete status: "+textStatus);
-            }
-        });
-
-      });
-
-    });
-    
-  </script>
-</head>
-
-<body>
-<div class="container-fluid">
-<div class="row center1">
-<div class="col-sm-8 col-sm-offset-2 col-xs-12 color-head">
-<h3>Service: Time-Lagged Correlation Map of Two Variables</h3>
-This service generates a time-lagged correlation map between two specified 
variables. 
-<br>The two variables can be either a two-dimensional variable or a slice of a 
three-dimensional variable at a specific pressure level.
-</div> <!-- col-sm -->
-<div class="col-sm-offset-2">
-</div> <!-- col-sm -->
-</div> <!-- row center1 -->
-
-<div class="row level0">
-<div class="col-sm-12 col-lg-6 level0 color0">
-  <div id="dataBlock1">
-  </div>
-</div> <!-- col level0 -->
-
-<div class="col-sm-12 col-lg-6 level0 color1">
-  <div id="dataBlock2">
-  </div>
-</div> <!-- col level0 -->
-
-<div class="color3">
-<div class="row center1 subtitle1" >
-Data Subsetting
-</div> <!-- row -->
-
-<div class="row">
-  <div class="col-sm-4 right1">
-    <div id=startYear>start year-month:</div>
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="t0" value="2004-01" alt="start"/>
-  </div>
-
-  <div class="col-sm-4 right1">
-    <div id=endYear>end year-month:</div>
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="t1" value="2004-12" alt="start"/>
-  </div>
-</div> <!-- row -->
-
-<div class="row">
-  <div class="col-sm-4 right1">
-    start lon (deg):
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="lon0" value="0"/>
-  </div>
-  <div class="col-sm-4 right1">
-    end lon (deg):
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="lon1" value="360"/>
-  </div>
-</div> <!-- row -->
-
-<div class="row">
-  <div class="col-sm-4 right1">
-    start lat (deg):
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="lat0" value="-90"/>
-  </div>
-  <div class="col-sm-4 right1">
-    end lat (deg):
-  </div>
-  <div class="col-sm-2 left1">
-    <input id="lat1" value="90"/>
-  </div>
-</div> <!-- row -->
-</div> <!-- color3 -->
-
-<div class="color2">
-<div class="row">
-  <div class="col-sm-4 right1">
-    lag (month):
-  </div>
-  <div class="col-sm-8 left1">
-    <input id="laggedTime" value="0"/>  
-  </div>
-</div>
-</div> <!-- color2 -->
-
-<div class="color3">
-<div class="row">
-  <div class="col-sm-4 right1">
-    Execution purpose:
-  </div> <!-- col -->
-  <div class="col-sm-8 left1">
-    <form>
-    <textarea name="purpose" id="purpose" rows="4" cols="50"> </textarea>
-    </form>
-  </div> <!-- col -->
-</div> <!-- row -->
-</div> <!-- color2 -->
-
-<div class="color4">
-<div class="row ">
-  <div class="col-sm-6 center1">
-    <input id="correlationMap" type="submit" value="            Get  Plot      
      " style="height:28px"/>
-  </div>
-  <div class="col-sm-6 center1">
-    <form>
-      <input id="download_data" type="button" value="Download Data" 
style="height:28px"/>
-    </form>
-  </div>
-</div> <!-- row -->
-</div> <!-- color -->
-
-<div class="row" center1>
-  <div class="col-sm-12 center1">
-    <div id="Image">Image Here</div>
-  </div>
-</div> <!-- row -->
-
-<div class="row" >
-  <div class="col-sm-12 center1">
-    <textarea readonly id="data_url" cols="150" rows="2">Data URL 
Here</textarea>
-  </div>
-</div> <!-- row -->
-
-<div class="row" center1>
-  <div class="col-sm-12 center1">
-    <textarea id="Response" cols="150" rows="6">Service Response Text 
Here</textarea>
-  </div>
-</div> <!-- row -->
-
-</div> <!-- container -->
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a8965336/public/html/diffPlot2Vars.html
----------------------------------------------------------------------
diff --git a/public/html/diffPlot2Vars.html b/public/html/diffPlot2Vars.html
deleted file mode 100644
index 4bd7c97..0000000
--- a/public/html/diffPlot2Vars.html
+++ /dev/null
@@ -1,1356 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <!-- <script 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js"; 
type="text/javascript"></script> -->
-  <script type="text/javascript" src="js/jquery-1.6.4.min.js"></script>
-  <script type="text/javascript" src="js/jquery.flot.min.js"></script>
-  <script type="text/javascript" src="js/json2.js"></script>
-  <script type="text/javascript" src="js/xmisc.js"></script>
-  <script type="text/javascript">
-
-    var Response = null;
-    var variable1 = "";
-    var variable2 = "";
-
-
-    // called on load or reload
-    window.onload = function() {
-      select_data1(1);
-      select_var1(1);
-      select_data1(2);
-      select_var1(2);
-      // no data to download yet
-      disable_download_button();
-    }
-
-    // disable download data button
-    function disable_download_button()
-    {
-      var x=document.getElementById("download_data");
-      x.disabled=true;
-    }
-
-    // enable download data button
-    function enable_download_button()
-    {
-      var x=document.getElementById("download_data");
-      x.disabled=false;
-    }
-
-
-    // disable all vars1 in dropdown menu
-    function unset_vars1(ID)
-    {
-      var x;
-
-      if (ID == 1) {
-        x=document.getElementById("var1");
-      }
-      else if (ID == 2) {
-        x=document.getElementById("var2");
-      }
-
-      x.options[0].disabled=true;
-      x.options[1].disabled=true;
-      x.options[2].disabled=true;
-      x.options[3].disabled=true;
-      x.options[4].disabled=true;
-      x.options[5].disabled=true;
-      x.options[6].disabled=true;
-      x.options[7].disabled=true;
-      x.options[8].disabled=true;
-      x.options[9].disabled=true;
-      x.options[10].disabled=true;
-      x.options[11].disabled=true;
-      x.options[12].disabled=true;
-      x.options[13].disabled=true;
-      x.options[14].disabled=true;
-      x.options[15].disabled=true;
-      x.options[16].disabled=true;
-      x.options[17].disabled=true;
-      x.options[18].disabled=true;
-      x.options[19].disabled=true;
-      x.options[20].disabled=true;
-      x.options[21].disabled=true;
-      x.options[22].disabled=true;
-      x.options[23].disabled=true;
-      x.options[24].disabled=true;
-      x.options[25].disabled=true;
-      x.options[26].disabled=true;
-      x.options[27].disabled=true;
-      x.options[28].disabled=true;
-      x.options[29].disabled=true;
-      x.options[30].disabled=true;
-      x.options[31].disabled=true;
-      x.options[32].disabled=true;
-    }
-
-
-    // disable pressure level box for 2D var
-    function disable_pres1(ID)
-    {
-      var x;
-      if (ID == 1) {
-        x=document.getElementById("pres1");
-      }
-      else if (ID == 2) {
-        x=document.getElementById("pres2");
-      }
-
-      x.value = "N/A";
-      x.disabled=true;
-    }
-
-    // enable pressure level box for 3D var
-    function enable_pres1(ID)
-    {
-      var x;
-      if (ID == 1) {
-        x=document.getElementById("pres1");
-      }
-      else if (ID == 2) {
-        x=document.getElementById("pres2");
-      }
-
-      x.value = "500";
-      x.disabled=false;
-    }
-
-    // form variable1 or variable2 string based on "var" dropdown selection
-    function select_var1(ID)
-    {
-      var var_string;
-
-      if (ID == 1) {
-        var_string = $("#var1").val();
-      }
-      else if (ID == 2) {
-        var_string = $("#var2").val();
-      }
-
-      // alert("var_string: " + var_string)
-
-      // disable the download button because of this change  
-      disable_download_button();  
-  
-      if (var_string == "Total Cloud Fraction") { 
-        if (ID == 1) {
-          variable1 = "clt";  // a 2D var
-        }
-        else if (ID == 2) {
-          variable2 = "clt";  // a 2D var
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-        // alert("variable1: " + variable1)
-      }
-      else if (var_string == "Surface Temperature") {
-        if (ID == 1) {
-          variable1 = "ts";  
-        }
-        else if (ID == 2) {
-          variable2 = "ts";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Sea Surface Temperature") { 
-        if (ID == 1) {
-          variable1 = "tos";  
-        }
-        else if (ID == 2) {
-          variable2 = "tos";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Precipitation Flux") { 
-        if (ID == 1) {
-          variable1 = "pr";  
-        }
-        else if (ID == 2) {
-          variable2 = "pr";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Eastward Near-Surface Wind") { 
-        if (ID == 1) {
-          variable1 = "uas";  
-        }
-        else if (ID == 2) {
-          variable2 = "uas";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Northward Near-Surface Wind") {  
-        if (ID == 1) {
-          variable1 = "vas";  
-        }
-        else if (ID == 2) {
-          variable2 = "vas";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Near-Surface Wind Speed") { 
-        if (ID == 1) {
-          variable1 = "sfcWind";  
-        }
-        else if (ID == 2) {
-          variable2 = "sfcWind";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Sea Surface Height") { 
-        if (ID == 1) {
-          variable1 = "zos";  
-        }
-        else if (ID == 2) {
-          variable2 = "zos";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Leaf Area Index") { 
-        if (ID == 1) {
-          variable1 = "lai";  
-        }
-        else if (ID == 2) {
-          variable2 = "lai";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Equivalent Water Height Over Land") {
-        if (ID == 1) {
-          variable1 = "zl";  
-        }
-        else if (ID == 2) {
-          variable2 = "zl";  
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Equivalent Water Height Over Ocean") {
-        if (ID == 1) {
-          variable1 = "zo";
-        }
-        else if (ID == 2) {
-          variable2 = "zo";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Ocean Heat Content Anomaly within 700 m Depth") {
-        if (ID == 1) {
-          variable1 = "ohc700";
-        }
-        else if (ID == 2) {
-          variable2 = "ohc700";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Ocean Heat Content Anomaly within 2000 m Depth") 
{
-        if (ID == 1) {
-          variable1 = "ohc2000";
-        }
-        else if (ID == 2) {
-          variable2 = "ohc2000";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Surface Downwelling Longwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rlds";
-        }
-        else if (ID == 2) {
-          variable2 = "rlds";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Surface Downwelling Shortwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rsds";
-        }
-        else if (ID == 2) {
-          variable2 = "rsds";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Surface Upwelling Longwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rlus";
-        }
-        else if (ID == 2) {
-          variable2 = "rlus";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Surface Upwelling Shortwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rsus";
-        }
-        else if (ID == 2) {
-          variable2 = "rsus";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Surface Downwelling Clear-Sky Longwave 
Radiation") {
-        if (ID == 1) {
-          variable1 = "rldscs";
-        }
-        else if (ID == 2) {
-          variable2 = "rldscs";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Surface Downwelling Clear-Sky Shortwave 
Radiation") {
-        if (ID == 1) {
-          variable1 = "rsdscs";
-        }
-        else if (ID == 2) {
-          variable2 = "rsdscs";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Surface Upwelling Clear-Sky Shortwave 
Radiation") {
-        if (ID == 1) {
-          variable1 = "rsuscs";
-        }
-        else if (ID == 2) {
-          variable2 = "rsuscs";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "TOA Incident Shortwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rsdt";
-        }
-        else if (ID == 2) {
-          variable2 = "rsdt";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "TOA Outgoing Clear-Sky Longwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rlutcs";
-        }
-        else if (ID == 2) {
-          variable2 = "rlutcs";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "TOA Outgoing Longwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rlut";
-        }
-        else if (ID == 2) {
-          variable2 = "rlut";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "TOA Outgoing Clear-Sky Shortwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rsutcs";
-        }
-        else if (ID == 2) {
-          variable2 = "rsutcs";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "TOA Outgoing Shortwave Radiation") {
-        if (ID == 1) {
-          variable1 = "rsut";
-        }
-        else if (ID == 2) {
-          variable2 = "rsut";
-        }
-        // disable pressure level box for 2D var
-        disable_pres1(ID);
-      }
-      else if (var_string == "Air Temperature") {
-        if (ID == 1) {
-          variable1 = "ta";
-        }
-        else if (ID == 2) {
-          variable2 = "ta";
-        }
-        // enable pressure level box for 3D var
-        enable_pres1(ID);
-      }
-      else if (var_string == "Specific Humidity") {
-        if (ID == 1) {
-          variable1 = "hus";
-        }
-        else if (ID == 2) {
-          variable2 = "hus";
-        }
-        // enable pressure level box for 3D var
-        enable_pres1(ID);
-      }
-      else if (var_string == "Cloud Ice Water Content") {
-        if (ID == 1) {
-          variable1 = "cli";
-        }
-        else if (ID == 2) {
-          variable2 = "cli";
-        }
-        // enable pressure level box for 3D var
-        enable_pres1(ID);
-      }
-      else if (var_string == "Cloud Liquid Water Content") {
-        if (ID == 1) {
-          variable1 = "clw";
-        }
-        else if (ID == 2) {
-          variable2 = "clw";
-        }
-        // enable pressure level box for 3D var
-        enable_pres1(ID);
-      }
-      else if (var_string == "Ocean Temperature") {
-        if (ID == 1) {
-          variable1 = "ot";
-        }
-        else if (ID == 2) {
-          variable2 = "ot";
-        }
-        // enable pressure level box for 3D var
-        enable_pres1(ID);
-      }
-      else if (var_string == "Ocean Salinity") {
-        if (ID == 1) {
-          variable1 = "os";
-        }
-        else if (ID == 2) {
-          variable2 = "os";
-        }
-        // enable pressure level box for 3D var
-        enable_pres1(ID);
-      }
-      else if (var_string == "Vertical Wind Velocity") {
-        if (ID == 1) {
-          variable1 = "wap";
-        }
-        else if (ID == 2) {
-          variable2 = "wap";
-        }
-        // enable pressure level box for 3D var
-        enable_pres1(ID);
-      }
-      else if (var_string == "Relative Humidity") {
-        if (ID == 1) {
-          variable1 = "hur";
-        }
-        else if (ID == 2) {
-          variable2 = "hur";
-        }
-        // enable pressure level box for 3D var
-        enable_pres1(ID);
-      }
-      // alert("variable1: " + variable1)
-    }
-
-
-    // set up "var1" dropdown based status of "data1" dropdown
-    function select_data1(ID)
-    {
-      var data_string;
-      var x;
-
-      if (ID == 1) {
-        data_string = $("#data1").val();
-        x = document.getElementById("var1");
-      }
-      else if (ID == 2) {
-        data_string = $("#data2").val();
-        x = document.getElementById("var2");
-      }
-
-      // alert(ID);
-      // alert(data_string);
-
-      // disable the download button because of this change
-      disable_download_button();
-
-      // disable corresponding "var" options
-      if (data_string == "NASA/AMSRE") {
-
-        unset_vars1(ID); // disable all options in "var" dropdown first
-
-        x.options[3].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[3].disabled=false;
-
-      }
-      else if (data_string == "NASA/MODIS") {
-
-        unset_vars1(ID);
-
-        x.options[1].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[1].disabled=false;
-        x.options[8].disabled=false;
-
-      }
-      else if (data_string == "NASA/TRMM") {
-
-        unset_vars1(ID);
-
-        x.options[0].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[0].disabled=false;
-
-      }
-      else if (data_string == "NASA/GPCP") {
-
-        unset_vars1(ID);
-
-        x.options[0].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[0].disabled=false;
-
-      }
-      else if (data_string == "NASA/QuikSCAT") {
-
-        unset_vars1(ID);
-
-        x.options[4].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[4].disabled=false;
-        x.options[5].disabled=false;
-        x.options[6].disabled=false;
-
-      }
-      else if (data_string == "NASA/AVISO") {
-
-        unset_vars1(ID);
-
-        x.options[7].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[7].disabled=false;
-
-      }
-      else if (data_string == "NASA/GRACE") {
-
-        unset_vars1(ID);
-
-        x.options[9].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[9].disabled=false;
-        x.options[10].disabled=false;
-
-      }
-      else if (data_string == "NOAA/NODC") {
-
-        unset_vars1(ID);
-
-        x.options[11].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[11].disabled=false;
-        x.options[12].disabled=false;
-
-      }
-      else if (data_string == "NASA/CERES") {
-
-        unset_vars1(ID);
-
-        x.options[13].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[13].disabled=false;
-        x.options[14].disabled=false;
-        x.options[15].disabled=false;
-        x.options[16].disabled=false;
-        x.options[17].disabled=false;
-        x.options[18].disabled=false;
-        x.options[19].disabled=false;
-        x.options[20].disabled=false;
-        x.options[21].disabled=false;
-        x.options[22].disabled=false;
-        x.options[23].disabled=false;
-        x.options[24].disabled=false;
-        // The following 6 commented out
-        // per request by Benyang
-        // x.options[25].disabled=false;
-        // x.options[26].disabled=false;
-        // x.options[27].disabled=false;
-        // x.options[28].disabled=false;
-        // x.options[29].disabled=false;
-        // x.options[30].disabled=false;
-
-      }
-      else if (data_string == "NASA/AIRS") {
-
-        unset_vars1(ID);
-
-        x.options[25].selected=true;
-        enable_pres1(ID); // the selected one is 3D
-
-        x.options[25].disabled=false;
-        x.options[26].disabled=false;
-
-      }
-      else if (data_string == "NASA/MLS") {
-
-        unset_vars1(ID);
-
-        x.options[25].selected=true;
-        enable_pres1(ID); // the selected one is 3D
-
-        x.options[25].disabled=false;
-        x.options[26].disabled=false;
-
-      }
-      else if (data_string == "ARGO/ARGO") {
-
-        unset_vars1(ID);
-
-        x.options[29].selected=true;
-        enable_pres1(ID); // the selected one is 3D
-
-        x.options[29].disabled=false;
-        x.options[30].disabled=false;
-
-        // alert("in ARGO ...");
-        // alert(data_string);
-      }
-      else if (data_string == "CCCMA/CANAM4") {
-
-        unset_vars1(ID);
-
-        x.options[0].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[0].disabled=false;
-        x.options[1].disabled=false;
-        x.options[2].disabled=false;
-        x.options[4].disabled=false;
-        x.options[5].disabled=false;
-        x.options[6].disabled=false;
-
-        x.options[13].disabled=false;
-        x.options[14].disabled=false;
-        x.options[15].disabled=false;
-        x.options[16].disabled=false;
-        x.options[17].disabled=false;
-        x.options[18].disabled=false;
-        x.options[19].disabled=false;
-        x.options[20].disabled=false;
-        x.options[21].disabled=false;
-        x.options[22].disabled=false;
-        x.options[23].disabled=false;
-        x.options[24].disabled=false;
-        x.options[25].disabled=false;
-        x.options[26].disabled=false;
-        x.options[27].disabled=false;
-        x.options[28].disabled=false;
-
-      }
-      else if (data_string == "CSIRO/MK3.6") {
-
-        unset_vars1(ID);
-
-        x.options[0].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[0].disabled=false;
-        x.options[1].disabled=false;
-        x.options[2].disabled=false;
-        x.options[4].disabled=false;
-        x.options[5].disabled=false;
-        x.options[6].disabled=false;
-
-        x.options[13].disabled=false;
-        x.options[14].disabled=false;
-        x.options[15].disabled=false;
-        x.options[16].disabled=false;
-        x.options[17].disabled=false;
-        x.options[18].disabled=false;
-        x.options[19].disabled=false;
-        x.options[20].disabled=false;
-        x.options[21].disabled=false;
-        x.options[22].disabled=false;
-        x.options[23].disabled=false;
-        x.options[24].disabled=false;
-        x.options[25].disabled=false;
-        x.options[26].disabled=false;
-        x.options[27].disabled=false;
-        x.options[28].disabled=false;
-        x.options[31].disabled=false;
-        x.options[32].disabled=false;
-
-      }
-      else if (data_string == "NCAR/CAM5") {
-
-        unset_vars1(ID);
-
-        x.options[0].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[0].disabled=false;
-        x.options[1].disabled=false;
-        x.options[2].disabled=false;
-        x.options[3].disabled=false;
-        x.options[4].disabled=false;
-        x.options[5].disabled=false;
-        x.options[6].disabled=false;
-        x.options[7].disabled=false;
-        x.options[8].disabled=false;
-
-        x.options[14].disabled=false;
-        x.options[15].disabled=false;
-        x.options[16].disabled=false;
-        x.options[17].disabled=false;
-        x.options[18].disabled=false;
-        x.options[19].disabled=false;
-        x.options[20].disabled=false;
-        x.options[21].disabled=false;
-        x.options[22].disabled=false;
-        x.options[23].disabled=false;
-        x.options[24].disabled=false;
-        x.options[25].disabled=false;
-        x.options[26].disabled=false;
-        x.options[27].disabled=false;
-        x.options[28].disabled=false;
-        x.options[31].disabled=false;
-        x.options[32].disabled=false;
-
-      }
-
-      else if (data_string == "CCCMA/CANESM2" || data_string == "GFDL/ESM2G" ||
-               data_string == "GISS/E2-H" || data_string == "GISS/E2-R" ||
-               data_string == "NCC/NORESM" ||
-               data_string == "UKMO/HadGEM2-ES" ||
-               data_string == "GFDL/CM3" || data_string == "IPSL/CM5A-LR" ||
-               data_string == "MIROC/MIROC5" || data_string == "UKMO/HadGEM2-A"
-              ) {
-
-        unset_vars1(ID);
-
-        x.options[0].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[0].disabled=false;
-        x.options[1].disabled=false;
-        x.options[2].disabled=false;
-        x.options[3].disabled=false;
-        x.options[4].disabled=false;
-        x.options[5].disabled=false;
-        x.options[6].disabled=false;
-        x.options[7].disabled=false;
-        x.options[8].disabled=false;
-
-        x.options[13].disabled=false;
-        x.options[14].disabled=false;
-        x.options[15].disabled=false;
-        x.options[16].disabled=false;
-        x.options[17].disabled=false;
-        x.options[18].disabled=false;
-        x.options[19].disabled=false;
-        x.options[20].disabled=false;
-        x.options[21].disabled=false;
-        x.options[22].disabled=false;
-        x.options[23].disabled=false;
-        x.options[24].disabled=false;
-        x.options[25].disabled=false;
-        x.options[26].disabled=false;
-        x.options[27].disabled=false;
-        x.options[28].disabled=false;
-        x.options[31].disabled=false;
-        x.options[32].disabled=false;
-
-      }
-      else if (data_string == "ECMWF/interim") {
-        unset_vars1(ID);
- 
-        x.options[3].selected=true;
-        disable_pres1(ID); // the selected one is 2D
-
-        x.options[3].disabled=false;
-        x.options[31].disabled=false;
-        x.options[32].disabled=false;
-      }
-
-      // form variable string
-      select_var1(ID);
-    }
-
-
-    $(document).ready(function(){
-
-      $("a").click(function(event){
-        alert("As you can see, the link no longer took you to jquery.com");
-        event.preventDefault();
-      });
-
-
-      $("#download_data").click(function(event) {
-        var durl = $("#data_url").val();
-        // alert(durl);
-        window.location.assign(durl);
-      });
-
-
-      $("#scatterPlot2V").click(function(event) {
-        // alert('****** inside scatterPlot2V()!');
-        Response = null;
-
-        // no data to download yet
-        disable_download_button();
-
-        $("#Response").html("Calculating ...");
-        $("#data_url").html("Calculating ...");
-        $("#Image").html("");
-
-        // sample url: 
http://cmacws.jpl.nasa.gov:9002/svc/scatterPlot2V?model1=ukmo_hadgem2-a&var1=ts&pres1=200&model2=ukmo_hadgem2-a&var2=clt&pres2=200&start_time=199001&end_time=199512&lon1=0&lon2=100&lat1=-29&lat2=29
-        // form url string
-        // var url = "http://cmacws.jpl.nasa.gov:9002/svc/scatterPlot2V?";;
-        var url = "http://"; + window.location.hostname + 
":9002/svc/diffPlot2V?";
-        // alert("url: " + url);
-
-        var d1 = $("#data1").val();
-        var model1 = d1.replace("/", "_");
-        model1 = model1.toLowerCase();
-
-        var arglist = "";
-        arglist = arglist.concat("model1=");
-        arglist = arglist.concat(model1);
-
-        // alert("arglist: " + arglist);
-
-        var v1 = $("#var1").val();
-        arglist = arglist.concat("&var1=");
-        arglist = arglist.concat(variable1);
-
-        // alert("arglist: " + arglist);
-
-        var pres1 = $("#pres1").val();
-        arglist = arglist.concat("&pres1=");
-        arglist = arglist.concat(pres1);
-
-        var d2 = $("#data2").val();
-        var model2 = d2.replace("/", "_");
-        model2 = model2.toLowerCase();
-
-        arglist = arglist.concat("&model2=");
-        arglist = arglist.concat(model2);
-
-        // alert("arglist: " + arglist);
-
-        var v2 = $("#var2").val();
-        arglist = arglist.concat("&var2=");
-        arglist = arglist.concat(variable2);
-
-        // alert("arglist: " + arglist);
-
-        var pres2 = $("#pres2").val();
-        arglist = arglist.concat("&pres2=");
-        arglist = arglist.concat(pres2);
-
-        var t0 = $("#t0").val();
-        var t1 = $("#t1").val();
-
-        t0 = t0.replace("-", "");
-        t1 = t1.replace("-", "");
-
-        arglist = arglist.concat("&start_time=");
-        arglist = arglist.concat(t0);
-
-        arglist = arglist.concat("&end_time=");
-        arglist = arglist.concat(t1);
-
-        // alert("arglist: " + arglist);
-
-        var lon0 = $("#lon0").val();
-        var lon1 = $("#lon1").val();
-        var lat0 = $("#lat0").val();
-        var lat1 = $("#lat1").val();
-
-        arglist = arglist.concat("&lon1=");
-        arglist = arglist.concat(lon0);
-
-        arglist = arglist.concat("&lon2=");
-        arglist = arglist.concat(lon1);
-
-        arglist = arglist.concat("&lat1=");
-        arglist = arglist.concat(lat0);
-
-        arglist = arglist.concat("&lat2=");
-        arglist = arglist.concat(lat1);
-
-        // alert("arglist: " + arglist);
-
-        var purpose = $("#purpose").val();
-        arglist = arglist.concat("&purpose=");
-        arglist = arglist.concat(purpose);
-
-        // url = url + encodeURIComponent(arglist);
-        url = url + encodeURI(arglist);
-        // url = url + arglist;
-        // alert("url: " + url);
-
-        var urlTimeBounds = "http://"; + window.location.hostname + 
":9002/svc/two_time_bounds?";
-        var arglistTB = "";
-        arglistTB = arglistTB.concat("serviceType=");
-        arglistTB = arglistTB.concat("2");
-        arglistTB = arglistTB.concat("&source1=");
-        arglistTB = arglistTB.concat(d1);
-        arglistTB = arglistTB.concat("&var1=");
-        arglistTB = arglistTB.concat(variable1);
-        arglistTB = arglistTB.concat("&source2=");
-        arglistTB = arglistTB.concat(d2);
-        arglistTB = arglistTB.concat("&var2=");
-        arglistTB = arglistTB.concat(variable2);
-        urlTimeBounds = urlTimeBounds + encodeURI(arglistTB);
-        // alert("urlTimeBounds: " + urlTimeBounds);
-
-        $.ajax({
-            type: "GET",
-            url: urlTimeBounds,
-            dataType: "json",
-            data: null,
-            success: function(data, textStatus, xhr) {
-                Response = data;
-                // alert("data: " + data);
-                if (data.success == false) {
-                    // alert(data.error);
-                    Response = null;
-                    var text = JSON.stringify(data, null, 4);
-                    text = "Error in backend: <br>" + text; 
-                    $("#Response").html(text);
-                    $("#data_url").html(text);
-                    return;
-                }
-                var text = JSON.stringify(data, null, 4);
-                // alert("text: " + text);
-                // $("#Response").html("<pre>"+text+"</pre>");
-                // $("#Response").html(text);
-
-                var tb1 = data.time_bounds1;
-                var bds1 = String(tb1).split(",");
-                // alert("tb1: " + tb1);
-                // alert("bds1: " + bds1);
-                var lowerT1 = parseInt(bds1[0]);
-                // alert("inside ajax, lowerT1: " + lowerT1);
-                var upperT1 = parseInt(bds1[1]);
-                // alert("upperT1: " + upperT1);
-
-                var tb2 = data.time_bounds2;
-                var bds2 = String(tb2).split(",");
-                // alert("tb2: " + tb2);
-                // alert("bds2: " + bds2);
-                var lowerT2 = parseInt(bds2[0]);
-                // alert("inside ajax, lowerT2: " + lowerT2);
-                var upperT2 = parseInt(bds2[1]);
-                // alert("upperT2: " + upperT2);
-
-                var t0I = parseInt(t0);
-                var t1I = parseInt(t1);
-                // alert("t0: " + t0I);
-                // alert("t1: " + t1I);
-
-                var lowerT, upperT;
-                // compute the intersection of the two data bounds
-                if (lowerT1 == 0  || upperT1 == 0){ // no data-1
-                  alert("We do not have data for the data-1 source and 
variable configuration.");
-                  return;
-                }
-                else if (lowerT2 == 0  || upperT2 == 0){ // no data-2
-                  alert("We do not have data for the data-2 source and 
variable configuration.");
-                  return;
-                }
-                else if (lowerT2 > upperT1 || lowerT1 > upperT2) { // no 
intersection
-                  alert("The two data sets/vars do not have a common time 
range.");
-                  return;
-                }
-                else { // compute intersection
-                  if (lowerT1 > lowerT2) { // pick bigger lower time bound
-                    lowerT = lowerT1;
-                  }
-                  else {
-                    lowerT = lowerT2;
-                  }
-
-                  if (upperT1 > upperT2) { // pick smaller upper time bound
-                    upperT = upperT2;
-                  }
-                  else {
-                    upperT = upperT1;
-                  }
-                }
-                // alert("lowerT: " + lowerT);
-                // alert("upperT: " + upperT);
-
-                if (t0I < lowerT && t1I < lowerT ||
-                    t0I > upperT && t1I > upperT) {
-                  alert("We do not have data that span your time range. Try 
the range inside ["+lowerT+", "+upperT+"].");
-                  return;
-                }
-
-                if (t0I < lowerT && t1I <= upperT) {
-                  alert("Your start year-month is out of bound. It has to be 
in or later than " + lowerT +
-                        ". We will use the range ["+lowerT+", "+t1I+"] for 
you.");
-                }
-
-                if (t1I > upperT && t0I >= lowerT) {
-                  alert("Your end year-month is out of bound. It has to be in 
or earlier than " + upperT +
-                        ". We will use the range ["+t0I+", "+upperT+"] for 
you.");
-                }
-
-                if (t0I < lowerT && t1I > upperT ) {
-                  alert("Both of your start and end year-months are out of 
bounds. They have to be in or earlier than " + upperT +
-                        ", and in or later than " + lowerT + ". We will use 
the range ["+lowerT+", "+upperT+"] for you.");
-                }
-            },
-            error: function(xhr, textStatus, errorThrown) {
-               $("#Response").html("error!");
-               $("#data_url").html("error!");
-                // alert("xhr.status: "+xhr.status);
-                // alert("error status: "+textStatus);
-            },
-            complete: function(xhr, textStatus) {
-                //alert("complete status: "+textStatus);
-            }
-        });
-
-
-        $.ajax({
-            type: "GET",
-            url: url,
-            dataType: "json",
-            data: null,
-            success: function(data, textStatus, xhr) {
-                Response = data;
-                // alert("data: " + data);
-                if (data.success == false) {
-                    // alert(data.error);
-                    Response = null;
-                    var text = JSON.stringify(data, null, 4);
-                    text = "Error in backend: <br>" + text; 
-                    // $("#Response").html("<span style='color:red'>" + text + 
"</span>");
-                    $("#Response").html(text);
-                    $("#data_url").html(text);
-                    return;
-                }
-                var text = JSON.stringify(data, null, 4);
-                // alert(text);
-                // $("#Response").html("<pre>"+text+"</pre>");
-                $("#Response").html(text);
-
-                var html = "<img src='"+data.url+"' width='820'/>";
-                // alert(html);
-                $("#Image").html(html);
-
-                // post dataUrl to textarea and enable download button
-                $("#data_url").html(data.dataUrl);
-                enable_download_button();
-            },
-            error: function(xhr, textStatus, errorThrown) {
-                $("#Response").html("error!");
-                $("#data_url").html("error!");
-                // alert("xhr.status: "+xhr.status);
-                // alert("error status: "+textStatus);
-            },
-            complete: function(xhr, textStatus) {
-                //alert("complete status: "+textStatus);
-            }
-        });
-
-      });
-
-    });
-    
-  </script>
-</head>
-<body>
-
-<p>
-
-<table border="1">
-
-<tr>
-<td colspan="4">
-<center>
-<b>Service: Difference Plot of Two Time Averaged Variables</b><br><br>
-This service calculates the differences between two specified variables and 
displays the lat-lon maps of the two variables and their differences. <br><br>
-</center>
-</td>
-</tr>
-
-<tr>
-<td colspan="2">
-<center>
-data 1
-</center>
-</td>
-
-<td colspan="2">
-<center>
-data 2
-</center>
-</td>
-</tr>
-
-<tr>
-<td>source:</td><td><select name="data1", id="data1" 
onchange="select_data1(1)">
-<optgroup label="Model: Historical">
-<option selected="CCCMA/CANESM2">CCCMA/CANESM2</option>
-<option>GFDL/ESM2G</option>
-<option>GISS/E2-H</option>
-<option>GISS/E2-R</option>
-<option>NCAR/CAM5</option>
-<option>NCC/NORESM</option>
-<option>UKMO/HadGEM2-ES</option>
-</optgroup>
-<optgroup label="Model: AMIP">
-<option>CCCMA/CANAM4</option>
-<option>CSIRO/MK3.6</option>
-<option>GFDL/CM3</option>
-<option>IPSL/CM5A-LR</option>
-<option>MIROC/MIROC5</option>
-<option>UKMO/HadGEM2-A</option>
-</optgroup>
-<!-- <option>NASA/obs4MIPs</option>  -->
-<optgroup label="Observation">
-<option>NASA/MODIS</option>
-<option>NASA/AMSRE</option>
-<option>NASA/TRMM</option>
-<option>NASA/GPCP</option>
-<option>NASA/QuikSCAT</option>
-<option>NASA/AVISO</option>
-<option>NASA/GRACE</option>
-<option>NOAA/NODC</option>
-<option>NASA/CERES</option>
-<option>NASA/AIRS</option>
-<option>NASA/MLS</option>
-<option>ARGO/ARGO</option>
-</optgroup>
-<optgroup label="Reanalysis">
-<option>ECMWF/interim</option>
-</optgroup>
-</select></td>
-
-<td>source:</td><td><select name="data2", id="data2" 
onchange="select_data1(2)">
-<optgroup label="Model: Historical">
-<option selected="CCCMA/CANESM2">CCCMA/CANESM2</option>
-<option>GFDL/ESM2G</option>
-<option>GISS/E2-H</option>
-<option>GISS/E2-R</option>
-<option>NCAR/CAM5</option>
-<option>NCC/NORESM</option>
-<option>UKMO/HadGEM2-ES</option>
-</optgroup>
-<optgroup label="Model: AMIP">
-<option>CCCMA/CANAM4</option>
-<option>CSIRO/MK3.6</option>
-<option>GFDL/CM3</option>
-<option>IPSL/CM5A-LR</option>
-<option>MIROC/MIROC5</option>
-<option>UKMO/HadGEM2-A</option>
-</optgroup>
-<!-- <option>NASA/obs4MIPs</option>  -->
-<optgroup label="Observation">
-<option>NASA/MODIS</option>
-<option>NASA/AMSRE</option>
-<option>NASA/TRMM</option>
-<option>NASA/GPCP</option>
-<option>NASA/QuikSCAT</option>
-<option>NASA/AVISO</option>
-<option>NASA/GRACE</option>
-<option>NOAA/NODC</option>
-<option>NASA/CERES</option>
-<option>NASA/AIRS</option>
-<option>NASA/MLS</option>
-<option>ARGO/ARGO</option>
-</optgroup>
-<optgroup label="Reanalysis">
-<option>ECMWF/interim</option>
-</optgroup>
-</select></td>
-
-</tr>
-
-<tr>
-
-<td>variable name:</td><td><select name="var1", id="var1" 
onchange="select_var1(1)">
-<option>Precipitation Flux</option>
-<option>Total Cloud Fraction</option>
-<option>Surface Temperature</option>
-<option>Sea Surface Temperature</option>
-<option>Eastward Near-Surface Wind</option>
-<option>Northward Near-Surface Wind</option>
-<option>Near-Surface Wind Speed</option>
-<option>Sea Surface Height</option>
-<option>Leaf Area Index</option>
-<option>Equivalent Water Height Over Land</option>
-<option>Equivalent Water Height Over Ocean</option>
-<option>Ocean Heat Content Anomaly within 700 m Depth</option>
-<option>Ocean Heat Content Anomaly within 2000 m Depth</option>
-<option>Surface Downwelling Longwave Radiation</option>
-<option>Surface Downwelling Shortwave Radiation</option>
-<option>Surface Upwelling Longwave Radiation</option>
-<option>Surface Upwelling Shortwave Radiation</option>
-<option>Surface Downwelling Clear-Sky Longwave Radiation</option>
-<option>Surface Downwelling Clear-Sky Shortwave Radiation</option>
-<option>Surface Upwelling Clear-Sky Shortwave Radiation</option>
-<option>TOA Incident Shortwave Radiation</option>
-<option>TOA Outgoing Longwave Radiation</option>
-<option>TOA Outgoing Shortwave Radiation</option>
-<option>TOA Outgoing Clear-Sky Longwave Radiation</option>
-<option>TOA Outgoing Clear-Sky Shortwave Radiation</option>
-<option>Air Temperature</option>
-<option>Specific Humidity</option>
-<option>Cloud Ice Water Content</option>
-<option>Cloud Liquid Water Content</option>
-<option>Ocean Temperature</option>
-<option>Ocean Salinity</option>
-<option>Vertical Wind Velocity</option>
-<option>Relative Humidity</option>
-</select>
-</td>
-
-
-<td>variable name:</td><td><select name="var2", id="var2" 
onchange="select_var1(2)">
-<option>Precipitation Flux</option>
-<option>Total Cloud Fraction</option>
-<option>Surface Temperature</option>
-<option>Sea Surface Temperature</option>
-<option>Eastward Near-Surface Wind</option>
-<option>Northward Near-Surface Wind</option>
-<option>Near-Surface Wind Speed</option>
-<option>Sea Surface Height</option>
-<option>Leaf Area Index</option>
-<option>Equivalent Water Height Over Land</option>
-<option>Equivalent Water Height Over Ocean</option>
-<option>Ocean Heat Content Anomaly within 700 m Depth</option>
-<option>Ocean Heat Content Anomaly within 2000 m Depth</option>
-<option>Surface Downwelling Longwave Radiation</option>
-<option>Surface Downwelling Shortwave Radiation</option>
-<option>Surface Upwelling Longwave Radiation</option>
-<option>Surface Upwelling Shortwave Radiation</option>
-<option>Surface Downwelling Clear-Sky Longwave Radiation</option>
-<option>Surface Downwelling Clear-Sky Shortwave Radiation</option>
-<option>Surface Upwelling Clear-Sky Shortwave Radiation</option>
-<option>TOA Incident Shortwave Radiation</option>
-<option>TOA Outgoing Longwave Radiation</option>
-<option>TOA Outgoing Shortwave Radiation</option>
-<option>TOA Outgoing Clear-Sky Longwave Radiation</option>
-<option>TOA Outgoing Clear-Sky Shortwave Radiation</option>
-<option>Air Temperature</option>
-<option>Specific Humidity</option>
-<option>Cloud Ice Water Content</option>
-<option>Cloud Liquid Water Content</option>
-<option>Ocean Temperature</option>
-<option>Ocean Salinity</option>
-<option>Vertical Wind Velocity</option>
-<option>Relative Humidity</option>
-</select>
-</td>
-
-</tr>
-
-<tr>
-
-<td>
-atmosphere pressure level (hPa) <br> or ocean pressure level (dbar)
-</td>
-<td>
-<input id="pres1" value="500" alt="pressure"/>
-</td>
-
-<td>
-atmosphere pressure level (hPa) <br> or ocean pressure level (dbar)
-</td>
-<td>
-<input id="pres2" value="500" alt="pressure"/>
-</td>
-
-</tr>
-
-<tr>
-</tr>
-
-<tr>
-<td>start year-month:</td><td><input id="t0" value="2004-01" alt="start"/></td>
-<td>end year-month:</td><td><input id="t1" value="2004-12" alt="end"/></td>
-</tr>
-
-
-<tr>
-<td>start lat (deg):</td><td><input id="lat0" value="-90"/></td>
-<td>end lat (deg):</td><td><input id="lat1" value="90"/></td>
-</tr>
-
-<tr>
-<td>start lon (deg):</td><td><input id="lon0" value="0"/></td>
-<td>end lon (deg):</td><td><input id="lon1" value="360"/></td>
-</tr>
-
-<tr>
-<td colspan="1">
-Execution purpose
-</td>
-<td colspan="3">
-<form>
-<textarea name="purpose" id="purpose" rows="4" cols="50"> </textarea>
-</form>
-</td>
-</tr>
-
-<tr>
-<td colspan="2" align="center"><input id="scatterPlot2V" type="submit" value=" 
           Get  Plot            " style="height:28px"/></td>
-<form>
-<td colspan="2" align="center"><input id="download_data" type="button" 
value="Download Data" style="height:28px"/>
-</td>
-</form>
-
-</tr>
-
-<tr>
-<td colspan="4">
-<div id="Image">Image Here</div>
-</td>
-</tr>
-
-<tr>
-<td colspan="4" align="center">
-<textarea readonly id="data_url" cols="89" rows="2">Data URL Here</textarea>
-</td>
-</tr>
-
-<tr>
-<td colspan="4" align="center">
-<textarea id="Response" cols="89" rows="6">Service Response Text 
Here</textarea>
-</td>
-</tr>
-
-</table>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a8965336/public/html/js/.svn/all-wcprops
----------------------------------------------------------------------
diff --git a/public/html/js/.svn/all-wcprops b/public/html/js/.svn/all-wcprops
deleted file mode 100644
index a8cfbb9..0000000
--- a/public/html/js/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 51
-/svn/cmac/!svn/ver/103/trunk/web_portal/cmac/web/js
-END
-jquery-1.6.4.min.js
-K 25
-svn:wc:ra_dav:version-url
-V 71
-/svn/cmac/!svn/ver/103/trunk/web_portal/cmac/web/js/jquery-1.6.4.min.js
-END
-json2.js
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/svn/cmac/!svn/ver/103/trunk/web_portal/cmac/web/js/json2.js
-END
-jquery-1.4.4.js
-K 25
-svn:wc:ra_dav:version-url
-V 67
-/svn/cmac/!svn/ver/103/trunk/web_portal/cmac/web/js/jquery-1.4.4.js
-END
-jquery-1.4.4.min.js
-K 25
-svn:wc:ra_dav:version-url
-V 71
-/svn/cmac/!svn/ver/103/trunk/web_portal/cmac/web/js/jquery-1.4.4.min.js
-END
-xmisc.js
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/svn/cmac/!svn/ver/103/trunk/web_portal/cmac/web/js/xmisc.js
-END
-jquery.flot.min.js
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/svn/cmac/!svn/ver/103/trunk/web_portal/cmac/web/js/jquery.flot.min.js
-END

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a8965336/public/html/js/.svn/entries
----------------------------------------------------------------------
diff --git a/public/html/js/.svn/entries b/public/html/js/.svn/entries
deleted file mode 100644
index 3276ab2..0000000
--- a/public/html/js/.svn/entries
+++ /dev/null
@@ -1,232 +0,0 @@
-10
-
-dir
-820
-https://kepler.jpl.nasa.gov/svn/cmac/trunk/web_portal/cmac/web/js
-https://kepler.jpl.nasa.gov/svn/cmac
-
-
-
-2013-02-06T09:16:39.558873Z
-103
-pan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7b6b0737-f4d6-4764-b6e6-6b822f93333f
-
-jquery-1.4.4.min.js
-file
-
-
-
-
-2014-01-06T22:10:37.115300Z
-73a9c334c5ca71d70d092b42064f6476
-2013-02-06T09:16:39.558873Z
-103
-pan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-78601
-
-xmisc.js
-file
-
-
-
-
-2014-01-06T22:10:37.115300Z
-5cca54013da56be3460df7bf384a442a
-2013-02-06T09:16:39.558873Z
-103
-pan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8076
-
-jquery.flot.min.js
-file
-
-
-
-
-2014-01-06T22:10:37.111300Z
-894855595d743ec62595d0772f1424fe
-2013-02-06T09:16:39.558873Z
-103
-pan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-32993
-
-jquery-1.6.4.min.js
-file
-
-
-
-
-2014-01-06T22:10:37.111300Z
-9118381924c51c89d9414a311ec9c97f
-2013-02-06T09:16:39.558873Z
-103
-pan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-91669
-
-json2.js
-file
-
-
-
-
-2014-01-06T22:10:37.111300Z
-70373c5d1da2b46813a293d4f3235e81
-2013-02-06T09:16:39.558873Z
-103
-pan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-17308
-
-jquery-1.4.4.js
-file
-
-
-
-
-2014-01-06T22:10:37.115300Z
-ede38e8db778584feacf86ef6767948a
-2013-02-06T09:16:39.558873Z
-103
-pan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-183184
-

Reply via email to