Fixed doc in CmfTutfirstModel and filename case in cmf.vcxproj #46

cmf/__init__.py

@@ -23,6 +23,7 @@
 
 
 __version__ = '1.3.1b'
+__compiletime__ = 'Mon Jul  2 18:03:47 2018'
 
 from .cmf_core import connect_cells_with_flux as __ccwf
 

documentation/tutorial/gettingstarted/CmfTutFirstModel.md

@@ -11,7 +11,7 @@ it is to introduce some of the elements of cmf.
 ## The model
 
 The model is a simple linear storage equation to transport water from
-one water storage (W,,1,,) to another water storage (W,,2,,).
+one water storage (@f$W_1@fS) to another water storage (@f$W_2@f$).
 
 
 @f[
@@ -20,10 +20,10 @@ q_{W_1,W_2}=\frac{V_1}{t_r}
 
 where:
 
-  - @f$q@f$ is the flux in @f$\frac {m^3}{day}@f$ from W,,1,, to
-    W,,2,,
-  - @f$V_1@f$ is the stored volume of water in W,,1,, in @f$m^3@f$
-  - @f$t_r@f$ is the mean residence time of the water in W,,1,, in
+  - @f$q@f$ is the flux in @f$\frac {m^3}{day}@f$ from @f$W_1@f$ to
+    @f$W_2@f$
+  - @f$V_1@f$ is the stored volume of water in @f$W_1@f$ in @f$m^3@f$
+  - @f$t_r@f$ is the mean residence time of the water in @f$W_1@f$ in
     days.
 
 ## Implementation

setup.py

@@ -30,7 +30,7 @@
 from distutils.sysconfig import customize_compiler
 from distutils.command.build_py import build_py
 
-version = '1.3.1b'
+version = '1.3.1'
 branchversion = version
 try:
     from pygit2 import Repository
@@ -42,7 +42,7 @@
 
 print('cmf', branchversion)
 
-# Try to import numpy, if it fails we have a problem 
+# Try to import numpy, if it fails we have a problem
 try:
     # Import a function to get a path to the include directories of numpy
     # noinspection PyPackageRequirements

tools/cmf.vcxproj

@@ -335,7 +335,7 @@
     <ClInclude Include="..\cmf\cmf_core_src\math\irregular_timeseries.h" />
     <ClInclude Include="..\cmf\cmf_core_src\Upslope\layer_list.h" />
     <ClInclude Include="..\cmf\cmf_core_src\reach\ManningConnection.h" />
-    <ClInclude Include="..\cmf\cmf_core_src\atmosphere\Meteorology.h" />
+    <ClInclude Include="..\cmf\cmf_core_src\atmosphere\meteorology.h" />
     <ClInclude Include="..\cmf\cmf_core_src\math\integrators\MultiIntegrator.h" />
     <ClInclude Include="..\cmf\cmf_core_src\math\integrators\sundials_cvode\include\nvector\nvector_parallel.h" />
     <ClInclude Include="..\cmf\cmf_core_src\math\integrators\sundials_cvode\include\nvector\nvector_serial.h" />
@@ -418,7 +418,7 @@
     <ClCompile Include="..\cmf\cmf_core_src\math\integrators\Integrator.cpp" />
     <ClCompile Include="..\cmf\cmf_core_src\Upslope\layer_list.cpp" />
     <ClCompile Include="..\cmf\cmf_core_src\reach\ManningConnection.cpp" />
-    <ClCompile Include="..\cmf\cmf_core_src\atmosphere\Meteorology.cpp" />
+    <ClCompile Include="..\cmf\cmf_core_src\atmosphere\meteorology.cpp" />
     <ClCompile Include="..\cmf\cmf_core_src\math\integrators\MultiIntegrator.cpp" />
     <ClCompile Include="..\cmf\cmf_core_src\math\integrators\sundials_cvode\src\nvector_serial.cpp" />
     <ClCompile Include="..\cmf\cmf_core_src\reach\OpenWaterStorage.cpp" />