Update the AATM functions

cmbgroundbased · Feb 26, 2021 · 5cf7ba8 · 5cf7ba8
1 parent d99df52
commit 5cf7ba8
Showing 1 changed file with 1 addition and 8 deletions.
diff --git 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);
     }