From 04853805258693a27c577e29757449e50f9cd2a3 Mon Sep 17 00:00:00 2001
From: yuanho <yuanho@ucar.edu>
Date: Fri, 18 May 2018 10:56:13 -0600
Subject: [PATCH] temp comment out CDO due to test fail

---
 src/ucar/unidata/idv/resources/derived.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ucar/unidata/idv/resources/derived.xml b/src/ucar/unidata/idv/resources/derived.xml
index c47d638735..fcb8b3acf7 100644
--- a/src/ucar/unidata/idv/resources/derived.xml
+++ b/src/ucar/unidata/idv/resources/derived.xml
@@ -1085,7 +1085,7 @@ to the derived tag. This causes the FieldSelector to make sure the user selects
     </categories>
     <operands/>
   </derived>
-  <derived description="Process one field using cdo" formula="cdo(variable,user_cdo_options)" id="cdo_processor" isdefault="false" isenduser="true">
+  <!--derived description="Process one field using cdo" formula="cdo(variable,user_cdo_options)" id="cdo_processor" isdefault="false" isenduser="true">
     <categories>
       <category display="true" value="Grids-MapesCollection-Climate Data Operators"/>
     </categories>
@@ -1181,7 +1181,7 @@ to the derived tag. This causes the FieldSelector to make sure the user selects
       <category value="display:imagecontroloverz"/>
     </categories>
     <operands/>
-  </derived>
+  </derived-->
   <derived description="Deviation from Lat Lon Area Average" formula="deviationXY(grid)" id="Deviation from area average" isdefault="false" isenduser="true">
     <categories>
       <category display="true" value="Grids-MapesCollection"/>
@@ -1218,7 +1218,7 @@ to the derived tag. This causes the FieldSelector to make sure the user selects
     </categories>
     <operands/>
   </derived>
-  <derived description="Subgrid fluxes using CDO 2 Variables at a Time" formula="cdoSubGrid(DerivedGridFactory.combineGrids(variable1,variable2),user_nlon,user_nlat)" id="subgrid fluxes using cdo 2 variables at a time" isdefault="false" isenduser="true">
+  <!--derived description="Subgrid fluxes using CDO 2 Variables at a Time" formula="cdoSubGrid(DerivedGridFactory.combineGrids(variable1,variable2),user_nlon,user_nlat)" id="subgrid fluxes using cdo 2 variables at a time" isdefault="false" isenduser="true">
     <categories>
       <category display="true" value="Grids-MapesCollection-Climate Data Operators"/>
     </categories>
@@ -1229,7 +1229,7 @@ to the derived tag. This causes the FieldSelector to make sure the user selects
       <category display="true" value="Grids-MapesCollection-Climate Data Operators"/>
     </categories>
     <operands categories=""/>
-  </derived>
+  </derived-->
   <derived description="Multiply Grids" formula="mul(S1[label=Grid1],S2[label=Grid2],WA=1)" id="Multiply Grids" isdefault="false" isenduser="true">
     <categories>
       <category display="true" value="Grids-MapesCollection-Basicmath"/>