Merge pull request #3 from NTIA/Issue_2

Fixes #2. Also bumps the version numbers.
NTIA · Apr 26, 2021 · 668e4ab · 668e4ab
2 parents 40c5b24 + 0fa9f99
commit 668e4ab
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/dotnet/ITS.Propagation.ITM/Properties/AssemblyInfo.cs b/dotnet/ITS.Propagation.ITM/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/dotnet/nuget/itm.nuspec b/dotnet/nuget/itm.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>ITM</id>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <authors>The Institute for Telecommunication Sciences</authors>
     <owners>The Institute for Telecommunication Sciences</owners>
     <license type="file">LICENSE.md</license>

diff --git a/src/LongleyRice.cpp b/src/LongleyRice.cpp
@@ -209,12 +209,12 @@ int LongleyRice(double theta_hzn[2], double f__mhz, complex<double> Z_g, double
         if (d__meter > d_x__meter)
         {
             *A_ref__db = M_s * d__meter + A_s0__db;
-            *propmode = MODE__DIFFRACTION;
+            *propmode = MODE__TROPOSCATTER;
         }
         else
         {
             *A_ref__db = M_d * d__meter + A_d0__db;
-            *propmode = MODE__TROPOSCATTER;
+            *propmode = MODE__DIFFRACTION;
         }
     }
 

diff --git a/win32/ITMDrvr/ITMDrvr.rc b/win32/ITMDrvr/ITMDrvr.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,11 +69,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The Institute for Telecommunication Sciences"
             VALUE "FileDescription", "Irregular Terrain Model (ITM) Driver"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "1.4.0.0"
             VALUE "InternalName", "ITMDrvr.exe"
             VALUE "OriginalFilename", "ITMDrvr.exe"
             VALUE "ProductName", "Irregular Terrain Model (ITM) Driver"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "1.4.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/win32/itm/itm.rc b/win32/itm/itm.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,11 +69,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The Institute for Telecommunication Sciences"
             VALUE "FileDescription", "Irregular Terrain Model (ITM)"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "1.4.0.0"
             VALUE "InternalName", "itm.dll"
             VALUE "OriginalFilename", "itm.dll"
             VALUE "ProductName", "Irregular Terrain Model (ITM)"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "1.4.0.0"
         END
     END
     BLOCK "VarFileInfo"