Final regression test edit

south-central-climate-science-center · May 11, 2015 · a7310b3 · a7310b3
1 parent 3f39a8a
commit a7310b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Regression_tests/xmls/darkchocolate_anom_PM_test.xml b/Regression_tests/xmls/darkchocolate_anom_PM_test.xml
@@ -1,6 +1,6 @@
 <downscale>
 	<ifpreexist>move</ifpreexist>
-    <input predictor_list = "tasmaxAnom" target = "tasmaxAnom" target_ID="txan" spat_mask = "na" maskvar = "na" spat_mask_ID="US48" in_root="/archive/esd/PROJECTS/DOWNSCALING" >
+    <input predictor_list = "tasminAnom" target = "tasminAnom" target_ID="tnan" spat_mask = "na" maskvar = "na" spat_mask_ID="US48" in_root="/archive/esd/PROJECTS/DOWNSCALING" >
 	<dim>OneD</dim> 
         <grid region = "US48">
             <lons>748</lons>
@@ -17,7 +17,7 @@
                 train_end_time = "20081231"
  		time_window='na'
                 >
-                <dataset>GCM_DATA.NCPP.GFDL-HIRAM-C360-COARSENED.amip.day.atmos.day.PManom1979-2008Sbx7.v20110601</dataset><!--- we know that we want the tasmax, tasmin vars 
+                <dataset>GCM_DATA.NCPP.GFDL-HIRAM-C360-COARSENED.amip.day.atmos.PManom1979-2008Sbx7.r1i1p1.v20110601</dataset><!--- we know that we want the tasmax, tasmin vars 
                 in the id directory as specified in <input predictor_list = ""> -->
             </historical_predictor>
             <historical_target
@@ -28,7 +28,7 @@
 		time_window = 'na'
             >
 <!-- NCPP2013.modified.NOAA-GFDL.GFDL-HIRAM-C360-COARSENED.sst2090.day.atmos.day.r1i1p2.v20110601 -->
-                <dataset>GCM_DATA.NCPP.GFDL-HIRAM-C360.amip.day.atmos.day.PManom1979-2008Sbx7.v20110601</dataset>
+                <dataset>GCM_DATA.NCPP.GFDL-HIRAM-C360.amip.day.atmos.PManom1979-2008Sbx7.r1i1p1.v20110601</dataset>
             </historical_target>
                 <!-- and in this case, we want the target var specified in <input> -->
             <future_predictor
@@ -38,7 +38,7 @@
                 train_end_time = "20951231"
                 time_window = 'na'
             >
-                <dataset>GCM_DATA.NCPP.GFDL-HIRAM-C360-COARSENED.sst2090.day.atmos.day.PManom2086-2095Sbx7.v20110601</dataset>
+                <dataset>GCM_DATA.NCPP.GFDL-HIRAM-C360-COARSENED.sst2090.day.atmos.PManom2086-2095Sbx7.r1i1p2.v20110601</dataset>
             </future_predictor>
         </training>
         <esdgen>
@@ -59,7 +59,7 @@
         </kfold>
     <!--specifies the OUTPUT DIRECTORY -->
         <output>
-            <out_dir>OUTPUT_DIR/downscaled/GFDL-HIRAM-C360-COARSENED/sst2090/day/atmos/day/PManom2086-2095Sbx7/v20110601/PMtxanp1-BCQM-B38ca2L01K00/tasmaxAnom/US48/OneD/</out_dir>
+            <out_dir>OUTPUT_DIR/downscaled/GFDL-HIRAM-C360-COARSENED/sst2090/day/atmos/day/PManom2086-2095Sbx7/v20110601/PMtnanp1-BCQM-B38ca2L01K00/tasminAnom/US48/OneD/</out_dir>
 	    <script_root>SCRIPT_DIR/regression_test_5/</script_root>
         </output>
     </core>

diff --git a/Rsuite/FudgeTrain/LoopByTimeWindow.R b/Rsuite/FudgeTrain/LoopByTimeWindow.R
@@ -159,7 +159,7 @@ LoopByTimeWindow <- function(train.predictor=NULL, train.target=NULL, esd.gen, m
           #Assign downscaled output to vector
           if(use.time.trim.mask){
 #             downscale.vec[!is.na(kfold.timemask)] <- temp.out[!is.na(kfold.timemask)]
-            temp.assign <- esd.gen[[1]]
+            temp.assign <- esd.gen
             temp.assign[!is.na(mask.struct[[3]]$masks[[window]])] <- temp.out
             downscale.vec[!is.na(kfold.timemask)] <- temp.assign[!is.na(kfold.timemask)]
           }else{
@@ -185,8 +185,8 @@ LoopByTimeWindow <- function(train.predictor=NULL, train.target=NULL, esd.gen, m
           #create.qc.mask=create.qc.mask, create.adjust.out=create.adjust.out)
           if(!is.null(temp.out$qc.mask)){
             if(use.time.trim.mask){
-              temp.assign <- esd.gen[[1]]
-              temp.assign[!is.na(mask.struct[[3]]$masks[[window]])] <- temp.out
+              temp.assign <- esd.gen
+              temp.assign[!is.na(mask.struct[[3]]$masks[[window]])] <- temp.out$qc.mask
               downscale.vec[!is.na(kfold.timemask)] <- temp.assign[!is.na(kfold.timemask)]
             }else{
               qc.mask[!is.na(kfold.gen)] <- temp.out$qc.mask #A NULL assignment might cause problems here. Second if?
@@ -197,8 +197,8 @@ LoopByTimeWindow <- function(train.predictor=NULL, train.target=NULL, esd.gen, m
           #If there is a time-trimming mask, use it here
           #Assign downscaled output to vector
           if(use.time.trim.mask){
-            temp.assign <- esd.gen[[1]]
-            temp.assign[!is.na(mask.struct[[3]]$masks[[window]])] <- temp.out
+            temp.assign <- esd.gen
+            temp.assign[!is.na(mask.struct[[3]]$masks[[window]])] <- temp.out$ds.out
             downscale.vec[!is.na(kfold.timemask)] <- temp.assign[!is.na(kfold.timemask)]
           }else{
             downscale.vec[!is.na(kfold.gen)] <- temp.out$ds.out