v536- repair of LatFlush with multiple recipients

minor vcxproj update to NetCDF 4.9.3

Author: analytophile

src/LatFlush.cpp

@@ -61,7 +61,7 @@ void CmvLatFlush::Initialize()
   ExitGracefullyIf(kTo == NULL, "LatFLush::Initialize (1)",OUT_OF_MEMORY);
 
   CHRUGroup *fromHRUGrp=_pModel->GetHRUGroup(_kk_from);
-  CHRUGroup *toHRUGrp  =_pModel->GetHRUGroup(_kk_from);
+  CHRUGroup *toHRUGrp  =_pModel->GetHRUGroup(_kk_to);
   _aFrac=NULL;
   _aFrac=new double [MAX_LAT_CONNECTIONS];
   ExitGracefullyIf(_aFrac == NULL, "LatFLush::Initialize",OUT_OF_MEMORY);

src/Raven.vcxproj

@@ -208,8 +208,8 @@
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release netCDF|x64'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files\netCDF 4.8.1\include; ../lib/lp_solve/; </IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);C:\Program Files\netCDF 4.8.1\bin\; ../lib/lp_solve/; </LibraryPath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files\netCDF 4.9.3\include; ../lib/lp_solve/; </IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);C:\Program Files\netCDF 4.9.3\bin\; ../lib/lp_solve/; </LibraryPath>
     <ExternalIncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</ExternalIncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug netCDF|x64'">
@@ -657,15 +657,15 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies); c:/Program Files/netCDF 4.8.1/lib/netcdf.lib; ../lib/lp_solve/lpsolve55.lib; </AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies); c:/Program Files/netCDF 4.9.3/lib/netcdf.lib; ../lib/lp_solve/lpsolve55.lib; </AdditionalDependencies>
       <OutputFile>.\ReleaseNetCDF\Raven.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\ReleaseNetCDF/Raven.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <AdditionalLibraryDirectories>c:/Program Files/netCDF 4.8.1/bin/; ../lib/lp_solve/; c:/Program Files/netCDF 4.8.1/include/;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>c:/Program Files/netCDF 4.9.3/bin/; ../lib/lp_solve/; c:/Program Files/netCDF 4.9.3/include/;</AdditionalLibraryDirectories>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>

src/StateVariables.cpp

@@ -588,6 +588,7 @@ bool  CStateVariable::IsWaterStorage (sv_type      typ, bool conv_coverup)
   case(CANOPY):          {return true;}
   case(CANOPY_SNOW):     {return true;}
   case(ROOT):            {return true;}
+  case(TRUNK):           {return true;}
   case(DEPRESSION):      {return true;}
   case(SNOW_LIQ):        {return true;}
   case(WETLAND):         {return true;}