v520 - minor fixes to EnKF (negative states) and LatFlush (fractional area calcs)

Author: James Craig

src/EnKF.cpp

@@ -661,7 +661,7 @@ void CEnKFEnsemble::UpdateFromStateMatrix(CModel* pModel,optStruct& Options,cons
        {
           CHydroUnit *pHRU=pModel->GetHRUGroup(kk)->GetHRU(k);
           int iii=pModel->GetStateVarIndex(_aAssimStates[i],_aAssimLayers[i]);
-          pHRU->SetStateVarValue(iii,_state_matrix[e][ii]); ii++;
+          pHRU->SetStateVarValue(iii,max(_state_matrix[e][ii],0.0)); ii++;
        }
     }
   }

src/LatFlush.cpp

@@ -130,7 +130,7 @@ void CmvLatFlush::Initialize()
           }
         }
         for (int qq = 0; qq < nRecipients; qq++) {//once sum is known for each source, calculate fraction
-          _aFrac[q-qq]=_aFrac[q-qq]/Asum;
+          _aFrac[q-qq-1]=_aFrac[q-qq-1]/Asum;
         }
       }
     }
@@ -235,6 +235,7 @@ void CmvLatFlush::GetLateralExchange( const double * const     *state_vars, //ar
 
     if (_divert) {
       mult=pHRUs[_kFrom[q]]->GetSurfaceProps()->divert_fract;
+      //cout<<" Lat Flush "<<q<<" kFrom: "<<_kFrom[q]<<" "<<_kTo[q] <<" iFrom: "<<_iFromLat[q]<<" "<< mult << " " << _aFrac[q] << " " << stor << endl;
     }
 
     exchange_rates[q]=max(mult*stor,0.0)/Options.timestep*Afrom*_aFrac[q]; //[mm-m2/d]