v502 - assimilation output file; ravenParams.dat update; warning if FIELD_CAPACITY=0

Author: James Craig

src/RavenParameters.dat

@@ -45,27 +45,27 @@ VIC_ZMAX SOIL [mm] False -9999 0.0 -9999
 VIC_ZMIN SOIL [mm] False -9999 0.0 -9999
 VIC_EVAP_GAMMA SOIL [-] False -9999 0.0 -9999
 PET_CORRECTION SOIL [0..1] True 1.0 0.0 1.0
-FIELD_CAPACITY SOIL [0..1] True 0.0 0.0 1.0
-SAT_WILT SOIL [0..1] True 0.0 0.0 1.0
+FIELD_CAPACITY SOIL [0..1] True 0.4 0.0 1.0
+SAT_WILT SOIL [0..1] True 0.02 0.0 1.0
 HYDRAUL_COND SOIL [mm/d] True 0.001 0 1000
 WETTING_FRONT_PSI SOIL [-mm] True -9999 -9999 -9999
-KSAT_STD_DEVIATION SOIL [log(mm/d)] False 0 -9999 -9999
+KSAT_STD_DEVIATION SOIL [log(mm/d)] False 0 0 -9999
 HBV_BETA SOIL [-] False 1 -9999 -9999
 MAX_PERC_RATE SOIL [mm/d] False 3 0 50
 UBC_INFIL_SOIL_DEF SOIL [mm] False 100 -9999 -9999
-PERC_COEFF SOIL [1/d] False -9999 0.0 -9999
-PERC_N SOIL [-] False 1.0 0.0 -9999
+PERC_COEFF SOIL [1/d] False 0.1 0.0 50
+PERC_N SOIL [-] False 1.0 0.0 10
 SAC_PERC_EXPON SOIL [-] False 3 -9999 -9999
-SAC_PERC_ALPHA SOIL [-] False 100 -9999 -9999
-MAX_CAP_RISE_RATE SOIL [mm/d] False 0 -9999 -9999
-BASEFLOW_COEFF SOIL [1/d] False 0.1 0 -9999
+SAC_PERC_ALPHA SOIL [-] False 100 0 -9999
+MAX_CAP_RISE_RATE SOIL [mm/d] False 1 0 50
+BASEFLOW_COEFF SOIL [1/d] False 0.1 0 1000
 BASEFLOW_N SOIL [-] False 5 0.5 5
-MAX_BASEFLOW_RATE SOIL [mm/d] False 5000 -9999 -9999
-BASEFLOW_THRESH SOIL [unknown] False -9999 -9999 -9999
+MAX_BASEFLOW_RATE SOIL [mm/d] False 5 0 5000
+BASEFLOW_THRESH SOIL [0..1] False 0 0 1.0
 MAX_INTERFLOW_RATE SOIL [mm/d] False 0.5 0 6
 EXCHANGE_FLOW SOIL [mm/d] False 0.1 0 -9999
 
-MAX_CAPACITY VEG [mm] True -9999 -9999 -9999
+MAX_CAPACITY VEG [mm] True 5 0 50
 TRUNK_FRACTION VEG [0..1] True 0 0 1
 CHU_MATURITY VEG [-] False 2800 0.0 -9999
 REL_ROOTDEN VEG [0..1] False 0.1 0.0 1.0

src/SoilClass.cpp

@@ -164,6 +164,10 @@ void CSoilClass::AutoCalculateSoilProps(const soil_struct &Stmp,
     warn="The required parameter FIELD_CAPACITY for soil class "+_tag+" was autogenerated with value "+to_string(_Soil.field_capacity);
     if (chatty){WriteAdvisory(warn,false);}
   }
+  if (_Soil.field_capacity == 0) { 
+    WriteWarning("Soil Parameter FIELD_CAPACITY should be greater than zero. This can lead to issues with some model configurations", false); 
+  }
+
 
   //Wilting point saturation
   autocalc=SetCalculableValue(_Soil.sat_wilt,Stmp.sat_wilt,Sdefault.sat_wilt);

src/StandardOutput.cpp

@@ -603,6 +603,23 @@ void CModel::WriteOutputFileHeaders(const optStruct &Options)
     }
   }
 
+  // Assimilation adjustments
+  //--------------------------------------------------------------
+  if (Options.assimilate_flow){
+    ofstream ASSIM;
+    tmpFilename=FilenamePrepare("AssimilationAdjustments.csv",Options);
+    ASSIM.open(tmpFilename.c_str());
+    if (ASSIM.fail()){
+      ExitGracefully(("CModel::WriteOutputFileHeaders: Unable to open output file "+tmpFilename+" for writing.").c_str(),FILE_OPEN_ERR);
+    }
+    ASSIM<<"time,date,hour";
+    for (int p = 0; p < _nSubBasins; p++) {
+      if((_pSubBasins[p]->IsGauged()) && (_pSubBasins[p]->IsEnabled())){
+        ASSIM<<","<<_pSubBasins[p]->GetName()<<" "; 
+      }
+    }
+  }
+
   // Custom output files
   //--------------------------------------------------------------
   for (int c=0;c<_nCustomOutputs;c++)
@@ -1076,9 +1093,7 @@ void CModel::WriteMinorOutput(const optStruct &Options,const time_struct &tt)
           pSB=_pSubBasins[p];
           if((pSB->IsGauged()) &&  (pSB->IsEnabled()) && (pSB->GetReservoir()!=NULL))
           {
-            string name,constraint_str;
-            if(pSB->GetName()==""){ name=to_string(pSB->GetID()); }
-            else                  { name=pSB->GetName(); }
+            string constraint_str;
 
             stage         =pSB->GetReservoir()->GetResStage();//m
             area          =pSB->GetReservoir()->GetSurfaceArea();//m2
@@ -1290,6 +1305,24 @@ void CModel::WriteMinorOutput(const optStruct &Options,const time_struct &tt)
         HRUSTOR.close();
       }
     }
+
+    // Assimilation adjustments
+    //--------------------------------------------------------------
+    if (Options.assimilate_flow){
+      ofstream ASSIM;
+      tmpFilename=FilenamePrepare("AssimilationAdjustments.csv",Options);
+      ASSIM.open(tmpFilename.c_str(),ios::app);
+
+      ASSIM<<usetime<<","<<usedate<<","<<usehour<<",";
+      for (int p = 0; p < _nSubBasins; p++) {
+        if((_pSubBasins[p]->IsGauged()) && (_pSubBasins[p]->IsEnabled())){
+          if (Options.assim_method==DA_ECCC){ASSIM<<","<<_aDAQadjust[p]<<" ";}
+          else                              {ASSIM<<","<<_aDAscale  [p]<<" ";}
+        }
+      }
+      ASSIM<<endl;
+      ASSIM.close();
+    }
   } // end of write output interval if statement
 
   // Custom output files