Skip to content

Organize Projects & Fix Bugs #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jhazentia wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Organize Projects & Fix Bugs #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3840fd2
put error codes in tables in readme.md, copied readme_2020 into readm…
jhazentia Mar 20, 2025
bce2451
removed duplicate header files, separated header and source files, im…
jhazentia Mar 21, 2025
8be5532
Cleaned up example input files, example output files updated to match…
jhazentia Apr 3, 2025
3412a2f
cleanup more example input files
jhazentia Apr 3, 2025
f05b3bd
Rerun all input files using 14.3 and update itu_old.in to use 14.x pa…
RBallardNTIA Apr 15, 2025
919d9d8
Revert text content changes based from README_2020.md
RBallardNTIA Apr 15, 2025
8270912
Updated Combined.sln to remove nonexistent Common VS project
RBallardNTIA Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ StyleCopReport.xml
*.pidb
*.svclog
*.scc
*.exe

# Chutzpah Test files
_Chutzpah*
Expand Down Expand Up @@ -359,4 +360,7 @@ MigrationBackup/
# Fody - auto-generated XML schema
FodyWeavers.xsd

#P372/Src/AtmosPlots/P372_figures
#P372/Src/AtmosPlots/P372_figures

# Linux shared object
*.so
18 changes: 2 additions & 16 deletions ITURHFProp/Bin/1-5-85.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,7 @@ Path.FW 0.0
Path.T0 0.0
Path.F0 0.0
Path.SorL "SHORTPATH"
<<<<<<< HEAD
\\RptFilePath "C:\Users\cbehm\Documents\GitHub\ITU-R-HF\Reports\"
\\RptFilePath "/media/sf_Behm/GitHub/ITU-R-HF/Reports/"
=======
RptFilePath "C:\Users\cbehm\Documents\GitHub\GitHf\Reports\"
\\RptFilePath "/media/sf_GitHub/ITU-R-HF/Reports/"
>>>>>>> 76fc4964e7ec74b4fd2cfeeae7578899fe961699
\\RptFileFormat "RPT_E | RPT_PR | RPT_RXLOCATION | RPT_D | RPT_SNRXX | RPT_OCR | RPT_OCRS"
\\RptFileFormat "RPT_ALL"
RptFilePath "../Reports/"
RptFileFormat "RPT_NOISESOURCESD | RPT_NOISESOURCES | RPT_NOISETOTALD | RPT_NOISETOTAL"
LL.lat 51.1166666667
LL.lng 7.26666666667
Expand All @@ -50,10 +42,4 @@ UR.lat 51.1166666667
UR.lng 7.26666666667
latinc 1.0
lnginc 1.0
<<<<<<< HEAD
DataFilePath "C:\Users\cbehm\Documents\GitHub\ITU-R-HF\P372\Data\"
\\DataFilePath "../../P372/Data/"
=======
DataFilePath "C:\Users\cbehm\Documents\GitHub\GitHf\Data\"
\\DataFilePath "/media/sf_GitHub/ITU-R-HF/Data/"
>>>>>>> 76fc4964e7ec74b4fd2cfeeae7578899fe961699
DataFilePath "../Data/"
100 changes: 46 additions & 54 deletions ITURHFProp/Bin/1-5-85.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,59 @@
---------------------------------------------------------------------------
International Telecommunications Union - Radiocommunication Sector (ITU-R)
<<<<<<< HEAD
ITURHFProp Ver Jun 7 2019 - Sun May 19 07:30:58 2019
HF Model (P533) Ver P.533-14 - Thu May 16 08:17:56 2019
Noise Model (P372) Ver P.372-13.3 - Thu May 16 08:17:06 2019
Analysis Prepared Fri Jun 7 16:09:39 2019
=======
ITURHFProp Ver May 23 2019 - Sun May 19 15:30:56 2019
HF Model (P533) Ver P.533-14 - Thu May 16 16:17:55 2019
Noise Model (P372) Ver P.372-13.3 - Thu May 16 16:17:05 2019
Analysis Prepared Fri Jun 7 22:24:34 2019
>>>>>>> 76fc4964e7ec74b4fd2cfeeae7578899fe961699
ITURHFProp Ver Apr 14 2025
HF Model (P533) Ver 14.2
Noise Model (P372) Ver 14.3
Analysis Prepared Mon Apr 14 13:56:30 2025

---------------------------------------------------------------------------

***************************** P533 Input Parameters ****************************

Test case ID 1: Year 85 Month 5
Year = 1985
Month = May
Hour = 20 (hour UTC)
SSN (R12) = 18
Distance = 174.728941 (km)
dmax = 4000.000000 (km)
Tx power = 0.000000
Tx Location LUXEMBURG
Tx latitude = 49.666667 N
Tx longitude = 6.316667 E
Rx Location BOCKHACKEN
Rx latitude = 51.116667 N
Rx longitude = 7.266667 E
local time Rx = 20 (hour UTC)
local time Tx = 20 (hour UTC)
Frequency = 6.100000
Bandwidth = 1000.000000
Modulation = ANALOG
Required signal-to-noise ratio = 10.000000
Required % of month signal-to-noise ratio = 10
Required signal-to-interference ratio = 23.760000
Man-made noise = RURAL
Antenna configuration: User determined
Transmit antenna ISOTROPIC
Transmit antenna bearing = 106.868000
Transmit antenna gain offset = 0.000000
Receive antenna ISOTROPIC
Receive antenna bearing = 43.666000
Receive antenna gain offset = 0.000000
Year : 1985
Month : May
Hour : 20 (hour UTC)
SSN (R12) : 18
Distance : 174.728941 (km)
dmax : 4000.000000 (km)
Tx power : 0.000000
Tx Location LUXEMBURG
Tx latitude : 49.666667 N
Tx longitude : 6.316667 E
Rx Location BOCKHACKEN
Rx latitude : 51.116667 N
Rx longitude : 7.266667 E
local time Rx : 20 (hour UTC)
local time Tx : 20 (hour UTC)
Frequency : 6.100000
Bandwidth : 1000.000000
Modulation : ANALOG
Required signal-to-noise ratio : 10.000000
Required % of month signal-to-noise ratio : 10
Required signal-to-interference ratio : 23.760000
Man-made noise : RURAL
Antenna configuration : User determined
Path Direction : SHORTPATH
Transmit antenna ISOTROPIC
Transmit antenna bearing : 106.868000
Transmit antenna gain offset : 0.000000
Receive antenna ISOTROPIC
Receive antenna bearing : 43.666000
Receive antenna gain offset : 0.000000

************************ End P533 Input Parameters *****************************

************************** ITURHFP Input Parameters *****************************

Upper left (North West) latitude = 51.116667 N
Upper left (North West) longitude = 7.266667 E
Lower right (South East) latitude = 51.116667 N
Lower right (South East) longitude = 7.266667 E
Number of frequencies = 1
Number of hours = 1
Number of months = 1
Latitude increment = 1.000000 (deg)
Longitude increment = 1.000000 (deg)
Upper left (North West) latitude : 51.116667 N
Upper left (North West) longitude : 7.266667 E
Lower right (South East) latitude : 51.116667 N
Lower right (South East) longitude : 7.266667 E
Number of frequencies : 1
Number of hours : 1
Number of months : 1
Latitude increment : 1.000000 (deg)
Longitude increment : 1.000000 (deg)

************************** ITURHFP Input Parameters *****************************

Expand All @@ -75,8 +69,8 @@ Column 07: DuA - Upper decile deviation of atmospheric noise (dB)
Column 08: DlA - Lower decile deviation of atmospheric noise (dB)
Column 09: DuM - Upper decile deviation of man-made noise (dB)
Column 10: DlM - Lower decile deviation of man-made noise (dB)
Column 11: DuG - Upper decile deviation of atmospheric noise (dB)
Column 12: DlG - Lower decile deviation of atmospheric noise (dB)
Column 11: DuG - Upper decile deviation of galatic noise (dB)
Column 12: DlG - Lower decile deviation of galatic noise (dB)
Column 13: DuT - Upper decile deviation of total noise (dB)
Column 14: DlT - Lower decile deviation of total noise (dB)
Column 15: FamT - Total noise (dB)
Expand All @@ -85,9 +79,7 @@ Column 15: FamT - Total noise (dB)

************************ Calculated Parameters ****************************

05, 20, 6.10, 50.81, 45.45, 33.94, 6.35, 6.27, 9.20, 4.60, 2.00, 2.00, 6.56, 5.57, 52.28
05, 20, 6.100, 49.90, 45.45, 33.94, 8.74, 7.91, 9.20, 4.60, 2.00, 2.00, 7.92, 7.31, 51.31

**************************End Calculated Parameters ***********************

Copyright International Telecommunication Union (ITU) 2019
All rights reserved.
6 changes: 2 additions & 4 deletions ITURHFProp/Bin/1-5-85_01.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@ Path.FW 0.0
Path.T0 0.0
Path.F0 0.0
Path.SorL "SHORTPATH"
RptFilePath "C:\Users\behm\Documents\GitHub\GitHf\Reports\"
\\RptFileFormat "RPT_E | RPT_PR | RPT_RXLOCATION | RPT_D | RPT_SNRXX | RPT_OCR | RPT_OCRS"
\\RptFileFormat "RPT_ALL"
RptFilePath "../Reports/"
RptFileFormat "RPT_NOISESOURCESD | RPT_NOISESOURCES | RPT_NOISETOTALD | RPT_NOISETOTAL"
SE.lat 51.1166666667
SE.lng 7.26666666667
NW.lat 51.1166666667
NW.lng 7.26666666667
latinc 1.0
lnginc 1.0
DataFilePath "C:\Users\behm\Documents\GitHub\GitHf\Data\"
DataFilePath "../Data/"
93 changes: 46 additions & 47 deletions ITURHFProp/Bin/1-5-85_01.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,59 @@
---------------------------------------------------------------------------
International Telecommunications Union - Radiocommunication Sector (ITU-R)
ITURHFProp Ver Jan 12 2018 - Fri Jan 12 14:12:26 2018
HF Model (P533) Ver P.533-13.7.0 - Fri Jan 12 16:10:02 2018
Noise Model (P372) Ver P.372-13.1.0 - Fri Jan 12 13:17:11 2018
Analysis Prepared Fri Jan 12 16:10:19 2018
ITURHFProp Ver Apr 14 2025
HF Model (P533) Ver 14.2
Noise Model (P372) Ver 14.3
Analysis Prepared Mon Apr 14 13:56:30 2025

---------------------------------------------------------------------------

***************************** P533 Input Parameters ****************************

Test case ID 1: Year 85 Month 5
Year = 1985
Month = May
Hour = 20 (hour UTC)
SSN (R12) = 18
Distance = 174.728941 (km)
dmax = 4000.000000 (km)
Tx power = 0.000000
Tx Location LUXEMBURG
Tx latitude = 49.666667 N
Tx longitude = 6.316667 E
Rx Location BOCKHACKEN
Rx latitude = 51.116667 N
Rx longitude = 7.266667 E
local time Rx = 20 (hour UTC)
local time Tx = 20 (hour UTC)
Frequency = 6.100000
Bandwidth = 1000.000000
Modulation = ANALOG
Required signal-to-noise ratio = 10.000000
Required % of month signal-to-noise ratio = 10
Required signal-to-interference ratio = 23.760000
Man-made noise = RURAL
Antenna configuration: User determined
Transmit antenna ISOTROPIC
Transmit antenna bearing = 106.868000
Transmit antenna gain offset = 0.000000
Receive antenna ISOTROPIC
Receive antenna bearing = 43.666000
Receive antenna gain offset = 0.000000
Year : 1985
Month : May
Hour : 20 (hour UTC)
SSN (R12) : 18
Distance : 174.728941 (km)
dmax : 4000.000000 (km)
Tx power : 0.000000
Tx Location LUXEMBURG
Tx latitude : 49.666667 N
Tx longitude : 6.316667 E
Rx Location BOCKHACKEN
Rx latitude : 51.116667 N
Rx longitude : 7.266667 E
local time Rx : 20 (hour UTC)
local time Tx : 20 (hour UTC)
Frequency : 6.100000
Bandwidth : 1000.000000
Modulation : ANALOG
Required signal-to-noise ratio : 10.000000
Required % of month signal-to-noise ratio : 10
Required signal-to-interference ratio : 23.760000
Man-made noise : RURAL
Antenna configuration : User determined
Path Direction : SHORTPATH
Transmit antenna ISOTROPIC
Transmit antenna bearing : 106.868000
Transmit antenna gain offset : 0.000000
Receive antenna ISOTROPIC
Receive antenna bearing : 43.666000
Receive antenna gain offset : 0.000000

************************ End P533 Input Parameters *****************************

************************** ITURHFP Input Parameters *****************************

Upper left latitude = 51.116667 N
Upper left longitude = 7.266667 E
Lower right latitude = 51.116667 N
Lower right longitude = 7.266667 E
Number of frequencies = 1
Number of hours = 1
Number of months = 1
Latitude increment = 1.000000 (deg)
Longitude increment = 1.000000 (deg)
Upper left (North West) latitude : 51.116667 N
Upper left (North West) longitude : 7.266667 E
Lower right (South East) latitude : 51.116667 N
Lower right (South East) longitude : 7.266667 E
Number of frequencies : 1
Number of hours : 1
Number of months : 1
Latitude increment : 1.000000 (deg)
Longitude increment : 1.000000 (deg)

************************** ITURHFP Input Parameters *****************************

Expand All @@ -68,8 +69,8 @@ Column 07: DuA - Upper decile deviation of atmospheric noise (dB)
Column 08: DlA - Lower decile deviation of atmospheric noise (dB)
Column 09: DuM - Upper decile deviation of man-made noise (dB)
Column 10: DlM - Lower decile deviation of man-made noise (dB)
Column 11: DuG - Upper decile deviation of atmospheric noise (dB)
Column 12: DuG - Lower decile deviation of atmospheric noise (dB)
Column 11: DuG - Upper decile deviation of galatic noise (dB)
Column 12: DlG - Lower decile deviation of galatic noise (dB)
Column 13: DuT - Upper decile deviation of total noise (dB)
Column 14: DlT - Lower decile deviation of total noise (dB)
Column 15: FamT - Total noise (dB)
Expand All @@ -78,9 +79,7 @@ Column 15: FamT - Total noise (dB)

************************ Calculated Parameters ****************************

05, 20, 6.10, 50.81, 45.45, 33.94, 6.35, 6.27, 9.20, 4.60, 2.00, 2.00, 6.56, 5.57, 52.28
05, 20, 6.100, 49.90, 45.45, 33.94, 8.74, 7.91, 9.20, 4.60, 2.00, 2.00, 7.92, 7.31, 51.31

**************************End Calculated Parameters ***********************

Copyright International Telecommunication Union (ITU) 2018
All rights reserved.
6 changes: 1 addition & 5 deletions ITURHFProp/Bin/1-8-84.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,4 @@ UR.lat 51.1166666667
UR.lng 7.26666666667
latinc 1.0
lnginc 1.0
<<<<<<< HEAD
DataFilePath "../../Data/"
=======
DataFilePath "../../P533/Data/"
>>>>>>> 76fc4964e7ec74b4fd2cfeeae7578899fe961699
DataFilePath "../Data/"
Loading