add CA/impact nearmiss check; update cmake policy

rahil-makadia · Nov 12, 2024 · 96cfcc3 · 96cfcc3
1 parent 33fde56
commit 96cfcc3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,6 @@
 # minimum required CMake version
 cmake_minimum_required(VERSION 3.18.0)
+cmake_policy(SET CMP0148 OLD)
 
 # if on a Mac, use any GNU compiler from Homebrew
 if(APPLE)

diff --git a/src/approach.cpp b/src/approach.cpp
@@ -138,6 +138,13 @@ void check_ca_or_impact(PropSimulation *propSim, const real &tOld,
                     ca.get_ca_parameters(propSim, ca.t);
                     propSim->caParams.push_back(ca);
                     if (ca.impact){
+                        real rCA;
+                        impact_r_calc(propSim, i, j, ca.t, rCA);
+                        // near miss check
+                        if (rCA > 0){
+                            ca.impact = false;
+                            break;
+                        }
                         ImpactParameters impact;
                         const real maxImpactCaTDiff = 600.0/86400.0; // 10 minutes
                         real tImpStart;