From 5cf7ba81a68e06261276c081b7bd336a6e68907d Mon Sep 17 00:00:00 2001
From: Stefano Mandelli <linuxfree2@gmail.com>
Date: Fri, 26 Feb 2021 11:16:19 +0100
Subject: [PATCH] Update the AATM functions

---
 src/libcal/src/AATM_fun.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/libcal/src/AATM_fun.cpp b/src/libcal/src/AATM_fun.cpp
index e458b179..49a8017e 100644
--- a/src/libcal/src/AATM_fun.cpp
+++ b/src/libcal/src/AATM_fun.cpp
@@ -112,11 +112,7 @@ double cal::atm_get_absorption_coefficient(double altitude,
     atm::SkyStatus ss = get_sky_status(altitude, temperature, pressure, freq);
     ss.setUserWH2O(pwv, "mm");
     // double opacity = ss.getWetOpacity().get();
-<<<<<<< HEAD
     double opacity = ss.getTotalOpacity().get(); // ???
-=======
-    double opacity = ss.getTotalOpacity().get();
->>>>>>> opacity_tot
 
     return 1 - exp(-opacity);
 }
@@ -134,11 +130,8 @@ int cal::atm_get_absorption_coefficient_vec(double altitude,
     ss.setUserWH2O(pwv, "mm");
     for (size_t i = 0; i < nfreq; ++i) {
         // double opacity = ss.getWetOpacity(i).get();
-<<<<<<< HEAD
         double opacity = ss.getTotalOpacity(i).get(); // ???
-=======
-        double opacity = ss.getTotalOpacity(i).get();
->>>>>>> opacity_tot
+
         absorption[i] = 1 - exp(-opacity);
     }