From 5213881c66a41f43dbc4633c16061fe90b235546 Mon Sep 17 00:00:00 2001 From: Theodore Kisner Date: Fri, 25 Oct 2019 00:00:32 -0700 Subject: [PATCH] Many small changes to make sure there is consistent use of vector size type (size_t) throughout the code. This removes nearly all compiler warnings under Visual C++. Code now compiles on Windows. --- src/libaatm/include/ATMAngle.h | 4 + src/libaatm/include/ATMException.h | 4 +- src/libaatm/include/ATMFrequency.h | 5 +- src/libaatm/include/ATMInverseLength.h | 4 + src/libaatm/include/ATMLength.h | 4 + src/libaatm/include/ATMMassDensity.h | 2 + src/libaatm/include/ATMNumberDensity.h | 4 +- src/libaatm/include/ATMOpacity.h | 4 + src/libaatm/include/ATMPercent.h | 16 +- src/libaatm/include/ATMPressure.h | 3 +- src/libaatm/include/ATMProfile.h | 142 ++--- src/libaatm/include/ATMRefractiveIndex.h | 540 ++++++++--------- .../include/ATMRefractiveIndexProfile.h | 358 +++++------ src/libaatm/include/ATMSkyStatus.h | 562 +++++++++--------- src/libaatm/include/ATMSpectralGrid.h | 102 ++-- src/libaatm/include/ATMTemperature.h | 4 +- src/libaatm/include/ATMWaterVaporRadiometer.h | 32 +- src/libaatm/src/ATMProfile.cpp | 343 ++++++----- src/libaatm/src/ATMRefractiveIndex.cpp | 538 ++++++++--------- src/libaatm/src/ATMRefractiveIndexProfile.cpp | 406 ++++++------- src/libaatm/src/ATMSkyStatus.cpp | 469 ++++++++------- src/libaatm/src/ATMSpectralGrid.cpp | 174 +++--- src/libaatm/src/ATMWVRMeasurement.cpp | 2 +- src/libaatm/src/ATMWaterVaporRadiometer.cpp | 68 +-- src/test/AbInitioTest.cpp | 48 +- src/test/ApexTest.cpp | 46 +- src/test/AtmBasicTest.cpp | 18 +- src/test/AtmProfileTest.cpp | 6 +- src/test/CMakeLists.txt | 48 ++ src/test/RefractiveIndexProfileTest.cpp | 4 +- src/test/SMATest.cpp | 54 +- src/test/SkyStatusTest.cpp | 22 +- src/test/SkyStatusTest_TINV.cpp | 26 +- src/test/SpectralGridTest.cpp | 62 +- src/test/atm651.cpp | 16 +- 35 files changed, 2115 insertions(+), 2025 deletions(-) diff --git a/src/libaatm/include/ATMAngle.h b/src/libaatm/include/ATMAngle.h index a239aee..1a4461f 100644 --- a/src/libaatm/include/ATMAngle.h +++ b/src/libaatm/include/ATMAngle.h @@ -76,6 +76,8 @@ class Angle Angle operator*(int scf) { return Angle(valueIS_*(double)scf); } // rhs scale factor /** Operator "multiplication of a angle by an unsigned int" */ Angle operator*(unsigned int scf) { return Angle(valueIS_*(double)scf); } // rhs scale factor + /** Operator "multiplication of a angle by an size_t" */ + Angle operator*(size_t scf) { return Angle(valueIS_*(double)scf); } // rhs scale factor /** Operator "division of a angle by a double" */ Angle operator/(double scf) { return Angle(valueIS_/scf); } /** Operator "division of a angle by a float" */ @@ -84,6 +86,8 @@ class Angle Angle operator/(int scf) { return Angle(valueIS_/(double)scf); } /** Operator "division of a angle by an unsigned int" */ Angle operator/(unsigned int scf) { return Angle(valueIS_/(double)scf); } + /** Operator "division of a angle by an size_t" */ + Angle operator/(size_t scf) { return Angle(valueIS_/(double)scf); } /** Operator "comparator < for two angles" */ bool operator<(const Angle & rhs) const { return (valueIS_ for two angles" */ diff --git a/src/libaatm/include/ATMException.h b/src/libaatm/include/ATMException.h index fe6f272..4859a79 100644 --- a/src/libaatm/include/ATMException.h +++ b/src/libaatm/include/ATMException.h @@ -30,7 +30,7 @@ #error "This is a C++ include file and cannot be used from plain C" #endif -#include "ATMCommon.h" +#include "ATMCommon.h" #include #include @@ -221,6 +221,6 @@ ATM_NAMESPACE_END * atm::AtmException(ATM_EXCEPTION_ARGS("An exception message...")); * @endcode */ -#define ATM_EXCEPTION_ARGS(msg) __FILE__, __PRETTY_FUNCTION__, __LINE__, msg +#define ATM_EXCEPTION_ARGS(msg) __FILE__, __FUNCTION__, __LINE__, msg #endif /*!_ATM_EXCEPTIONS_H*/ diff --git a/src/libaatm/include/ATMFrequency.h b/src/libaatm/include/ATMFrequency.h index 152f544..24e9b65 100644 --- a/src/libaatm/include/ATMFrequency.h +++ b/src/libaatm/include/ATMFrequency.h @@ -83,6 +83,8 @@ class Frequency inline Frequency operator*(int scf) { return Frequency(valueIS_ * (double) scf); } /** Operator "multiplication of a frequency by an unsigned int" */ inline Frequency operator*(unsigned int scf) { return Frequency(valueIS_ * (double) scf); } + /** Operator "multiplication of a frequency by an size_t" */ + inline Frequency operator*(size_t scf) { return Frequency(valueIS_ * (double) scf); } /** Operator "division of a frequency by a double" */ inline Frequency operator/(double scf) { return Frequency(valueIS_ / scf); } /** Operator "division of a frequency by a float" */ @@ -91,6 +93,8 @@ class Frequency inline Frequency operator/(int scf) { return Frequency(valueIS_ / (double) scf); } /** Operator "division of a frequency by an unsigned int" */ inline Frequency operator/(unsigned int scf) { return Frequency(valueIS_ / (double) scf); } + /** Operator "division of a frequency by an size_t" */ + inline Frequency operator/(size_t scf) { return Frequency(valueIS_ / (double) scf); } /** Operator "comparator < for two frequencies" */ inline bool operator<(const Frequency &rhs) const {return (valueIS_ < rhs.get()); } /** Operator "comparator > for two frequencies" */ @@ -115,4 +119,3 @@ class Frequency ATM_NAMESPACE_END #endif /*!_ATM_FREQUENCY_H*/ - diff --git a/src/libaatm/include/ATMInverseLength.h b/src/libaatm/include/ATMInverseLength.h index 4a08056..62f9a4c 100644 --- a/src/libaatm/include/ATMInverseLength.h +++ b/src/libaatm/include/ATMInverseLength.h @@ -77,6 +77,8 @@ class InverseLength inline InverseLength operator*(int scf) { return InverseLength(valueIS_ * (double) scf); } /** Operator "multiplication of a inverse length by an unsigned int" */ inline InverseLength operator*(unsigned int scf) { return InverseLength(valueIS_ * (double) scf); } + /** Operator "multiplication of a inverse length by an size_t" */ + inline InverseLength operator*(size_t scf) { return InverseLength(valueIS_ * (double) scf); } /** Operator "division of a inverse length by a double" */ inline InverseLength operator/(double scf) { return InverseLength(valueIS_ / scf); } /** Operator "division of a inverse length by a float" */ @@ -85,6 +87,8 @@ class InverseLength inline InverseLength operator/(int scf) { return InverseLength(valueIS_ / (double) scf); } /** Operator "division of a inverse length by an unsigned int" */ inline InverseLength operator/(unsigned int scf) { return InverseLength(valueIS_ / (double) scf); } + /** Operator "division of a inverse length by an size_t" */ + inline InverseLength operator/(size_t scf) { return InverseLength(valueIS_ / (double) scf); } /** Operator "comparator < for two inverse lengths" */ inline bool operator<(const InverseLength & rhs) const { return (valueIS_ < rhs.get()); } /** Operator "comparator > for two inverse lengths" */ diff --git a/src/libaatm/include/ATMLength.h b/src/libaatm/include/ATMLength.h index 35c77e6..234155d 100644 --- a/src/libaatm/include/ATMLength.h +++ b/src/libaatm/include/ATMLength.h @@ -82,6 +82,8 @@ class Length inline Length operator*(int scf) { return Length(valueIS_ * (double) scf); } /** Operator "multiplication of a length by an unsigned int" */ inline Length operator*(unsigned int scf) { return Length(valueIS_ * (double) scf); } + /** Operator "multiplication of a length by an size_t" */ + inline Length operator*(size_t scf) { return Length(valueIS_ * (double) scf); } /** Operator "division of a length by a double" */ inline Length operator/(double scf) { return Length(valueIS_ / scf); } /** Operator "division of a length by a float" */ @@ -90,6 +92,8 @@ class Length inline Length operator/(int scf) { return Length(valueIS_ / (double) scf); } /** Operator "division of a length by an unsigned int" */ inline Length operator/(unsigned int scf) { return Length(valueIS_ / (double) scf); } + /** Operator "division of a length by an size_t" */ + inline Length operator/(size_t scf) { return Length(valueIS_ / (double) scf); } /** Operator "comparator < for two lengths" */ inline bool operator<(const Length &rhs) const { return (valueIS_ < rhs.get()); } /** Operator "comparator > for two lengths" */ diff --git a/src/libaatm/include/ATMMassDensity.h b/src/libaatm/include/ATMMassDensity.h index 3afec86..53e4844 100644 --- a/src/libaatm/include/ATMMassDensity.h +++ b/src/libaatm/include/ATMMassDensity.h @@ -70,10 +70,12 @@ class MassDensity MassDensity operator*(float scf) { return MassDensity(valueIS_ * (double) scf); } MassDensity operator*(int scf) { return MassDensity(valueIS_ * (double) scf); } MassDensity operator*(unsigned int scf) { return MassDensity(valueIS_ * (double) scf); } + MassDensity operator*(size_t scf) { return MassDensity(valueIS_ * (double) scf); } MassDensity operator/(double scf) { return MassDensity(valueIS_ / scf); } MassDensity operator/(float scf) { return MassDensity(valueIS_ / (double) scf); } MassDensity operator/(int scf) { return MassDensity(valueIS_ / (double) scf); } MassDensity operator/(unsigned int scf) { return MassDensity(valueIS_ / (double) scf); } + MassDensity operator/(size_t scf) { return MassDensity(valueIS_ / (double) scf); } bool operator<(const MassDensity & rhs) const { return (valueIS_ < rhs.get()); } bool operator>(const MassDensity & rhs) const { return (valueIS_ > rhs.get()); } bool operator<=(const MassDensity & rhs) const { return (valueIS_ <= rhs.get()); } diff --git a/src/libaatm/include/ATMNumberDensity.h b/src/libaatm/include/ATMNumberDensity.h index b26c5cf..edb4fa5 100644 --- a/src/libaatm/include/ATMNumberDensity.h +++ b/src/libaatm/include/ATMNumberDensity.h @@ -69,10 +69,12 @@ class NumberDensity NumberDensity operator*(float scf) { return NumberDensity(valueIS_ * (double) scf); } NumberDensity operator*(int scf) { return NumberDensity(valueIS_ * (double) scf); } NumberDensity operator*(unsigned int scf) { return NumberDensity(valueIS_ * (double) scf); } + NumberDensity operator*(size_t scf) { return NumberDensity(valueIS_ * (double) scf); } NumberDensity operator/(double scf) { return NumberDensity(valueIS_ / scf); } NumberDensity operator/(float scf) { return NumberDensity(valueIS_ / (double) scf); } NumberDensity operator/(int scf) { return NumberDensity(valueIS_ / (double) scf); } NumberDensity operator/(unsigned int scf) { return NumberDensity(valueIS_ / (double) scf); } + NumberDensity operator/(size_t scf) { return NumberDensity(valueIS_ / (double) scf); } bool operator<(const NumberDensity &rhs) const { return (valueIS_ < rhs.get()); } bool operator>(const NumberDensity &rhs) const { return (valueIS_ > rhs.get()); } bool operator<=(const NumberDensity &rhs) const { return (valueIS_ <= rhs.get()); } @@ -87,5 +89,3 @@ class NumberDensity ATM_NAMESPACE_END #endif /*!_ATM_NUMBERDENSITY_H*/ - - diff --git a/src/libaatm/include/ATMOpacity.h b/src/libaatm/include/ATMOpacity.h index 2387bf7..8ba255a 100644 --- a/src/libaatm/include/ATMOpacity.h +++ b/src/libaatm/include/ATMOpacity.h @@ -78,6 +78,8 @@ class Opacity inline Opacity operator*(int scf) { return Opacity(valueIS_ * (double) scf); } /** Operator "multiplication of an opacity by an unsigned int" */ inline Opacity operator*(unsigned int scf) { return Opacity(valueIS_ * (double) scf); } + /** Operator "multiplication of an opacity by a size_t" */ + inline Opacity operator*(size_t scf) { return Opacity(valueIS_ * (double) scf); } /** Operator "division of a opacity by an int" */ inline Opacity operator/(double scf) { return Opacity(valueIS_ / scf); } /** Operator "division of a opacity by a float" */ @@ -86,6 +88,8 @@ class Opacity inline Opacity operator/(int scf) { return Opacity(valueIS_ / (double) scf); } /** Operator "division of a opacity by an unsigned int" */ inline Opacity operator/(unsigned int scf) { return Opacity(valueIS_ / (double) scf); } + /** Operator "division of a opacity by a size_t" */ + inline Opacity operator/(size_t scf) { return Opacity(valueIS_ / (double) scf); } /** Operator "comparator < for two opacities" */ inline bool operator<(const Opacity &rhs) const { return (valueIS_ < rhs.get()); } /** Operator "comparator > for two opacities" */ diff --git a/src/libaatm/include/ATMPercent.h b/src/libaatm/include/ATMPercent.h index 65c21c6..17c3f8c 100644 --- a/src/libaatm/include/ATMPercent.h +++ b/src/libaatm/include/ATMPercent.h @@ -2,18 +2,18 @@ #define _ATM_PERCENT_H /******************************************************************************* * ALMA - Atacama Large Millimiter Array -* (c) Instituto de Estructura de la Materia, 2009 -* +* (c) Instituto de Estructura de la Materia, 2009 +* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. -* +* * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. -* +* * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -76,6 +76,8 @@ class Percent inline Percent operator*(int scf) { return Percent(valueIS_ * (double) scf); } /** Operator "multiplication of a percent by an unsigned int" */ inline Percent operator*(unsigned int scf) { return Percent(valueIS_ * (double) scf); } + /** Operator "multiplication of a percent by an size_t" */ + inline Percent operator*(size_t scf) { return Percent(valueIS_ * (double) scf); } /** Operator "division of a percent by a double" */ inline Percent operator/(double scf) { return Percent(valueIS_ / scf); } /** Operator "division of a percent by a float" */ @@ -84,6 +86,8 @@ class Percent inline Percent operator/(int scf) { return Percent(valueIS_ / (double) scf); } /** Operator "division of a percent by an unsigned int" */ inline Percent operator/(unsigned int scf) { return Percent(valueIS_ / (double) scf); } + /** Operator "division of a percent by an size_t" */ + inline Percent operator/(size_t scf) { return Percent(valueIS_ / (double) scf); } /** Operator "comparator < for two percentages" */ inline bool operator<(const Percent &rhs) const { return (valueIS_ < rhs.get()); } /** Operator "comparator > for two percentages" */ @@ -96,7 +100,7 @@ class Percent inline bool operator==(const Percent &rhs) const { return (valueIS_ == rhs.get()); } /** Operator "comparator != for two percentages" */ inline bool operator!=(const Percent &rhs) const { return (valueIS_ != rhs.get()); } - + private: double valueIS_; }; // class Percent @@ -104,5 +108,3 @@ class Percent ATM_NAMESPACE_END #endif /*!_ATM_PERCENT_H*/ - - diff --git a/src/libaatm/include/ATMPressure.h b/src/libaatm/include/ATMPressure.h index ff790fe..01b2b2a 100644 --- a/src/libaatm/include/ATMPressure.h +++ b/src/libaatm/include/ATMPressure.h @@ -68,10 +68,12 @@ class Pressure Pressure operator*(float scf) { return Pressure(valueIS_ * (double) scf); } Pressure operator*(int scf) { return Pressure(valueIS_ * (double) scf); } Pressure operator*(unsigned int scf) { return Pressure(valueIS_ * (double) scf); } + Pressure operator*(size_t scf) { return Pressure(valueIS_ * (double) scf); } Pressure operator/(double scf) { return Pressure(valueIS_ / scf); } Pressure operator/(float scf) { return Pressure(valueIS_ / (double) scf); } Pressure operator/(int scf) { return Pressure(valueIS_ / (double) scf); } Pressure operator/(unsigned int scf) { return Pressure(valueIS_ / (double) scf); } + Pressure operator/(size_t scf) { return Pressure(valueIS_ / (double) scf); } bool operator<(const Pressure &rhs) const { return (valueIS_ < rhs.get()); } bool operator>(const Pressure &rhs) const { return (valueIS_ > rhs.get()); } bool operator<=(const Pressure &rhs) const { return (valueIS_ <= rhs.get()); } @@ -86,4 +88,3 @@ class Pressure ATM_NAMESPACE_END #endif /*!_ATM_PRESSURE_H*/ - diff --git a/src/libaatm/include/ATMProfile.h b/src/libaatm/include/ATMProfile.h index 245c4bd..46f7e73 100644 --- a/src/libaatm/include/ATMProfile.h +++ b/src/libaatm/include/ATMProfile.h @@ -79,10 +79,10 @@ class AtmProfile { public: /** A constructor of an empty profile with n layers, that can be filled up later. */ - AtmProfile(unsigned int n); + AtmProfile(size_t n); - /** A long constructor of the atmospheric profile from the basic set of parameters described above. - Please note that this constructor assumes that the &altitude of the antenna is the SAME of the + /** A long constructor of the atmospheric profile from the basic set of parameters described above. + Please note that this constructor assumes that the &altitude of the antenna is the SAME of the weather station that provides: &groundPressure, &groundTemperature, and &relativeHumidity */ AtmProfile(const Length &altitude, const Pressure &groundPressure, @@ -93,10 +93,10 @@ class AtmProfile const Pressure &pressureStep, double pressureStepFactor, const Length &topAtmProfile, - unsigned int atmType); //Atmospheretype atmType); + size_t atmType); //Atmospheretype atmType); - - /** A long constructor of the atmospheric profile from the basic set of parameters described above which, + + /** A long constructor of the atmospheric profile from the basic set of parameters described above which, in addition, includes user-defined temperature profile */ AtmProfile(const Length &altitude, const Pressure &groundPressure, @@ -107,12 +107,12 @@ class AtmProfile const Pressure &pressureStep, double pressureStepFactor, const Length &topAtmProfile, - unsigned int atmType, + size_t atmType, const vector &v_layerBoundaries, - const vector &v_layerTemperature); + const vector &v_layerTemperature); + - /** A long constructor of the atmospheric profile from the basic set of parameters described above. */ /* AtmProfile(Length altitude, Pressure groundPressure, @@ -132,7 +132,7 @@ class AtmProfile double tropoLapseRate, const Humidity &relativeHumidity, const Length &wvScaleHeight, - unsigned int atmType); //Atmospheretype atmType); + size_t atmType); //Atmospheretype atmType); /*AtmProfile(const Length &altitude, const Pressure &groundPressure, @@ -142,7 +142,7 @@ class AtmProfile const vector &v_layerTopPressure, const vector &v_layerTopTemperature, const vector &v_layerTopHumidity); */ - + /** The user provides his own atmospheric profile (basic one: four vectors for layer thickness in m, average pressure in each layer in mb, average temperature in each layer in K, and average water vapor density in each layer in kg/m**3). QUESTION: SHOULD O3, CO, N2O, NO2, SO2 PROFILES BE FILLED UP @@ -243,8 +243,8 @@ class AtmProfile string getAtmosphereType() const; /** Accessor to the type of atmosphere specified by the number**/ - static string getAtmosphereType(unsigned int typeAtm); - + static string getAtmosphereType(size_t typeAtm); + /** Accessor to the current Ground Temperature used in the object */ Temperature getGroundTemperature() const { return groundTemperature_; } @@ -281,14 +281,14 @@ class AtmProfile /** Alternative accessor to the ground altitude of site (length units) */ Length getGroundAltitude() const { return altitude_; } - /** setter for the ground altitude of site (length units). Careful! It will remove or add layers if necessary. + /** setter for the ground altitude of site (length units). Careful! It will remove or add layers if necessary. Ground values of T/P/h would change as well */ void setAltitude(const Length &groundaltitude); - /** Alternative setter for the ground altitude of site (length units). Careful! It will remove or add layers if necessary. + /** Alternative setter for the ground altitude of site (length units). Careful! It will remove or add layers if necessary. Ground values of T/P/h would change as well */ // void setGroundAltitude(const Length &groundaltitude); - + /** Accessor to the altitude of the tropopause (length units) */ Length getTropopauseAltitude() const { return tropoAltitude_; } @@ -296,7 +296,7 @@ class AtmProfile Length getTopAtmProfile() const { return topAtmProfile_; } /** Accessor to the number of layers of the atmospheric profile */ - unsigned int getNumLayer() const { return numLayer_; } + size_t getNumLayer() const { return numLayer_; } /** Method to access the Temperature Profile */ vector getTemperatureProfile() const; @@ -305,22 +305,22 @@ class AtmProfile * Method to access the average Temperature in layer i (thickness of layers in ThicknessProfile) * @exception AtmException if the layer is not valid. **/ - Temperature getLayerTemperature(unsigned int i) const; + Temperature getLayerTemperature(size_t i) const; /** * Method to access the Temperature at bottom of layer i (thickness of layers in ThicknessProfile) * @exception AtmException if the layer is not valid. **/ - Temperature getLayerBottomTemperature(unsigned int i) const; + Temperature getLayerBottomTemperature(size_t i) const; /** * Method to access the Temperature at top of layer i (thickness of layers in ThicknessProfile) * @exception AtmException if the layer is not valid. **/ - Temperature getLayerTopTemperature(unsigned int i) const; - + Temperature getLayerTopTemperature(size_t i) const; + /** Setter for the average Temperature in layer i (allows to touch one layer each time once a profile has been defined) */ - void setLayerTemperature(unsigned int i, const Temperature &layerTemperature); + void setLayerTemperature(size_t i, const Temperature &layerTemperature); /** Method to retrieve the layer thickness from site altitude upwards. * Use Altitude to + ThicknessProfile to know the vertical grid. */ @@ -330,56 +330,56 @@ class AtmProfile * Method to access the layer thickness of layer i * @exception AtmException if the layer is not valid. */ - Length getLayerThickness(unsigned int i) const; + Length getLayerThickness(size_t i) const; /** Setter for the thickness of layer i (allows to touch one layer each time once a profile has been defined). We do * not advise to use this one unless you change P and T accordingly */ - void setLayerThickness(unsigned int i, const Length &layerThickness); - //void setLayerThickness(const Length &layerThickness, unsigned int i) { setLayerThickness(i, layerThickness); } + void setLayerThickness(size_t i, const Length &layerThickness); + //void setLayerThickness(const Length &layerThickness, size_t i) { setLayerThickness(i, layerThickness); } /** * Method to access the Bottom Height of layer i above the Ground * @exception AtmException if the layer is not valid. */ - Length getLayerBottomHeightAboveGround(unsigned int i) const; + Length getLayerBottomHeightAboveGround(size_t i) const; /** * Method to access the Bottom Height of layer i above the Sea Level * @exception AtmException if the layer is not valid. */ - Length getLayerBottomHeightAboveSeaLevel(unsigned int i) const; - - + Length getLayerBottomHeightAboveSeaLevel(size_t i) const; + + /** * Method to access the Top Height of layer i above the Ground * @exception AtmException if the layer is not valid. */ - Length getLayerTopHeightAboveGround(unsigned int i) const; - + Length getLayerTopHeightAboveGround(size_t i) const; + /** * Method to access the Top Height of layer i above the Sea Level * @exception AtmException if the layer is not valid. */ - Length getLayerTopHeightAboveSeaLevel(unsigned int i) const; + Length getLayerTopHeightAboveSeaLevel(size_t i) const; + - /** Function to retrieve Average Water vapor density in a given layer in kg/m**3 * (thickness of layers in ThicknessProfile) * @exception AtmException if the layer is not valid. */ - MassDensity getLayerWaterVaporMassDensity(unsigned int i) const; - MassDensity getLayerBottomWaterVaporMassDensity(unsigned int i) const; - MassDensity getLayerTopWaterVaporMassDensity(unsigned int i) const; - NumberDensity getLayerWaterVaporNumberDensity(unsigned int i) const; - NumberDensity getLayerBottomWaterVaporNumberDensity(unsigned int i) const; - NumberDensity getLayerTopWaterVaporNumberDensity(unsigned int i) const; + MassDensity getLayerWaterVaporMassDensity(size_t i) const; + MassDensity getLayerBottomWaterVaporMassDensity(size_t i) const; + MassDensity getLayerTopWaterVaporMassDensity(size_t i) const; + NumberDensity getLayerWaterVaporNumberDensity(size_t i) const; + NumberDensity getLayerBottomWaterVaporNumberDensity(size_t i) const; + NumberDensity getLayerTopWaterVaporNumberDensity(size_t i) const; /** Setter for the average Water vapor density in layer i in kg/m**3 (allows to touch one layer each * time once a profile has been defined) */ - void setLayerWaterVaporMassDensity(unsigned int i, const MassDensity &layerWaterVapor); - //void setLayerWaterVaporMassDensity(const MassDensity &layerWaterVapor, unsigned int i) { setLayerWaterVaporMassDensity(i, layerWaterVapor); } - void setLayerWaterVaporNumberDensity(unsigned int i, const NumberDensity &layerWaterVapor); - //void setLayerWaterVapor(const NumberDensity &layerWaterVapor, unsigned int i) { setLayerWaterVapor(i, layerWaterVapor); } + void setLayerWaterVaporMassDensity(size_t i, const MassDensity &layerWaterVapor); + //void setLayerWaterVaporMassDensity(const MassDensity &layerWaterVapor, size_t i) { setLayerWaterVaporMassDensity(i, layerWaterVapor); } + void setLayerWaterVaporNumberDensity(size_t i, const NumberDensity &layerWaterVapor); + //void setLayerWaterVapor(const NumberDensity &layerWaterVapor, size_t i) { setLayerWaterVapor(i, layerWaterVapor); } /** Method to get the Pressure Profile */ vector getPressureProfile() const; @@ -387,62 +387,62 @@ class AtmProfile /** Method to access the average Pressure in layer i * @exception AtmException if the layer is not valid. */ - Pressure getLayerPressure(unsigned int i) const; + Pressure getLayerPressure(size_t i) const; /** Method to access the Pressure at bottom of layer i * @exception AtmException if the layer is not valid. */ - Pressure getLayerBottomPressure(unsigned int i) const; + Pressure getLayerBottomPressure(size_t i) const; /** Method to access the Pressure at top of layer i * @exception AtmException if the layer is not valid. */ - Pressure getLayerTopPressure(unsigned int i) const; + Pressure getLayerTopPressure(size_t i) const; /** Setter for the average Pressure in layer i (allows to touch one layer each * time once a profile has been defined) */ - void setLayerPressure(unsigned int i, const Pressure &layerPressure) { v_layerPressure_[i] = layerPressure.get("mb"); } - //void setLayerPressure(const Pressure &layerPressure, unsigned int i) { setLayerPressure(i, layerPressure); } + void setLayerPressure(size_t i, const Pressure &layerPressure) { v_layerPressure_[i] = layerPressure.get("mb"); } + //void setLayerPressure(const Pressure &layerPressure, size_t i) { setLayerPressure(i, layerPressure); } /** Function to retrieve CO density in a given layer (thickness of layers * in ThicknessProfile) */ - NumberDensity getLayerCO(unsigned int i) const { return NumberDensity(v_layerCO_[i], "m**-3"); } + NumberDensity getLayerCO(size_t i) const { return NumberDensity(v_layerCO_[i], "m**-3"); } /** Setter for the average number density of CO in layer i in molecules/m**3 (allows to touch one layer each * time once a profile has been defined) */ - void setLayerCO(unsigned int i, const NumberDensity &layerCO) { v_layerCO_[i] = layerCO.get("m**-3"); } - //void setLayerCO(const NumberDensity &layerCO, unsigned int i) { setLayerCO(i, layerCO); } + void setLayerCO(size_t i, const NumberDensity &layerCO) { v_layerCO_[i] = layerCO.get("m**-3"); } + //void setLayerCO(const NumberDensity &layerCO, size_t i) { setLayerCO(i, layerCO); } /** Function to retrieve O3 density in a given layer (thickness of layers * in ThicknessProfile) */ - NumberDensity getLayerO3(unsigned int i) const { return NumberDensity(v_layerO3_[i], "m**-3"); } + NumberDensity getLayerO3(size_t i) const { return NumberDensity(v_layerO3_[i], "m**-3"); } /** Setter for the average number density of O3 in layer i in molecules/m**3 (allows to touch one layer each * time once a profile has been defined) */ - void setLayerO3(unsigned int i, const NumberDensity &layerO3) { v_layerO3_[i] = layerO3.get("m**-3"); } - //void setLayerO3(const NumberDensity &layerO3, unsigned int i) { setLayerO3(i, layerO3); } + void setLayerO3(size_t i, const NumberDensity &layerO3) { v_layerO3_[i] = layerO3.get("m**-3"); } + //void setLayerO3(const NumberDensity &layerO3, size_t i) { setLayerO3(i, layerO3); } /** Function to retrieve N2O density in a given layer (thickness of layers * in ThicknessProfile) */ - NumberDensity getLayerN2O(unsigned int i) const { return NumberDensity(v_layerN2O_[i], "m**-3"); } + NumberDensity getLayerN2O(size_t i) const { return NumberDensity(v_layerN2O_[i], "m**-3"); } /** Setter for the average number density of N2O in layer i in molecules/m**3 (allows to touch one layer each * time once a profile has been defined) */ - void setLayerN2O(unsigned int i, const NumberDensity &layerN2O) { v_layerN2O_[i] = layerN2O.get("m**-3"); } - //void setLayerN2O(const NumberDensity &layerN2O, unsigned int i) { setLayerN2O(i, layerN2O); } + void setLayerN2O(size_t i, const NumberDensity &layerN2O) { v_layerN2O_[i] = layerN2O.get("m**-3"); } + //void setLayerN2O(const NumberDensity &layerN2O, size_t i) { setLayerN2O(i, layerN2O); } /** Function to retrieve NO2 density in a given layer (thickness of layers * in ThicknessProfile) */ - NumberDensity getLayerNO2(unsigned int i) const { return NumberDensity(v_layerNO2_[i], "m**-3"); } + NumberDensity getLayerNO2(size_t i) const { return NumberDensity(v_layerNO2_[i], "m**-3"); } /** Setter for the average number density of NO2 in layer i in molecules/m**3 (allows to touch one layer each * time once a profile has been defined) */ - void setLayerNO2(unsigned int i, const NumberDensity &layerNO2) { v_layerNO2_[i] = layerNO2.get("m**-3"); } - //void setLayerNO2(const NumberDensity &layerNO2, unsigned int i) { setLayerNO2(i, layerNO2); } + void setLayerNO2(size_t i, const NumberDensity &layerNO2) { v_layerNO2_[i] = layerNO2.get("m**-3"); } + //void setLayerNO2(const NumberDensity &layerNO2, size_t i) { setLayerNO2(i, layerNO2); } /** Function to retrieve SO2 density in a given layer (thickness of layers * in ThicknessProfile) */ - NumberDensity getLayerSO2(unsigned int i) const { return NumberDensity(v_layerSO2_[i], "m**-3"); } + NumberDensity getLayerSO2(size_t i) const { return NumberDensity(v_layerSO2_[i], "m**-3"); } /** Setter for the average number density of SO2 in layer i in molecules/m**3 (allows to touch one layer each * time once a profile has been defined) */ - void setLayerSO2(unsigned int i, const NumberDensity &layerSO2) { v_layerSO2_[i] = layerSO2.get("m**-3"); } - //void setLayerSO2(const NumberDensity &layerSO2, unsigned int i) { setLayerSO2(i, layerSO2); } + void setLayerSO2(size_t i, const NumberDensity &layerSO2) { v_layerSO2_[i] = layerSO2.get("m**-3"); } + //void setLayerSO2(const NumberDensity &layerSO2, size_t i) { setLayerSO2(i, layerSO2); } void setBasicAtmosphericParameterThresholds(const Length &altitudeThreshold, const Pressure &groundPressureThreshold, @@ -450,7 +450,7 @@ class AtmProfile double tropoLapseRateThreshold, const Humidity &relativeHumidityThreshold, const Length &wvScaleHeightThreshold); - + /** Method to get the zenith column of water vapor. It is computed by * simply integrating the H2O profile: @@ -474,13 +474,13 @@ class AtmProfile //@} protected: - unsigned int typeAtm_; //!< 1: tropical, 2: midlatSummer, 3: midlatWinter, 4: subarcticSummer, 5: subarcticWinter + size_t typeAtm_; //!< 1: tropical, 2: midlatSummer, 3: midlatWinter, 4: subarcticSummer, 5: subarcticWinter Temperature groundTemperature_; //!< Ambient temperature at the site (K) double tropoLapseRate_; //!< tropospheric lapse rate in K/km Temperature tropoTemperature_; //!< Temperature at the tropopause - unsigned int tropoLayer_; //!< Layer where tropopause starts + size_t tropoLayer_; //!< Layer where tropopause starts Length tropoAltitude_; //!< Altitude where tropopause starts - Pressure groundPressure_; //!< Ground pressure at the site + Pressure groundPressure_; //!< Ground pressure at the site Humidity relativeHumidity_; /** Relative humidity at the site (%) used only to make an estimate of the water vapor column, first guess) */ @@ -494,7 +494,7 @@ class AtmProfile Length altitude_; //!< Altitude of the site (km) Length topAtmProfile_; //!< Top of atmospheric profile (km) - unsigned int numLayer_; //!< Total number of layers in the output atmospheric profiles + size_t numLayer_; //!< Total number of layers in the output atmospheric profiles double fractionLast_; //!< Fraction of last layer needed for some calculations bool newBasicParam_; vector v_layerThickness_; //!< Thickness of layer (m) @@ -519,7 +519,7 @@ class AtmProfile Humidity relativeHumidityThreshold_; Length wvScaleHeightThreshold_; - unsigned int ier_; + size_t ier_; /** Default constructor (required if copy constructor in derived classes) */ AtmProfile() {} @@ -527,7 +527,7 @@ class AtmProfile /* * \fn Method to build the profile, */ - unsigned int mkAtmProfile(); /** returns error code: <0 unsuccessful */ + size_t mkAtmProfile(); /** returns error code: <0 unsuccessful */ /** Method to update an atmospheric profile based on one or more new basic parameter(s) * @param altitude the new altitude, a Length @@ -550,7 +550,7 @@ class AtmProfile private: MassDensity rwat(const Temperature &t, const Humidity &rh, const Pressure &p) const; Humidity rwat_inv(const Temperature &tt, const MassDensity &dd, const Pressure &pp) const; - vector st76(const Length &ha, unsigned int tip) const; + vector st76(const Length &ha, size_t tip) const; double poli2(double ha, double x1, double x2, diff --git a/src/libaatm/include/ATMRefractiveIndex.h b/src/libaatm/include/ATMRefractiveIndex.h index 4423b3b..85ef64e 100644 --- a/src/libaatm/include/ATMRefractiveIndex.h +++ b/src/libaatm/include/ATMRefractiveIndex.h @@ -63,28 +63,28 @@ ATM_NAMESPACE_BEGIN * -# Specific Phase Dispersion Coefficient (\f$rad\cdot m^2\f$) = Real part of the result of the getSpecificRefractivity operator. * * - species \f$(g)\f$ codes: - * -# \f$^{16}O^{16}O\f$ - * -# \f$^{16}O^{16}O vib\f$ - * -# \f$^{16}O^{18}O\f$ - * -# \f$^{16}O^{17}O\f$ - * -# \f$CO \f$ - * -# \f$N_2O\f$ - * -# \f$NO_2\f$ - * -# \f$SO_2\f$ + * -# \f$^{16}O^{16}O\f$ + * -# \f$^{16}O^{16}O vib\f$ + * -# \f$^{16}O^{18}O\f$ + * -# \f$^{16}O^{17}O\f$ + * -# \f$CO \f$ + * -# \f$N_2O\f$ + * -# \f$NO_2\f$ + * -# \f$SO_2\f$ * -# \f$CNTH2O \f$ - * -# \f$CNTDRY \f$ - * -# \f$HH^{16}O \f$ + * -# \f$CNTDRY \f$ + * -# \f$HH^{16}O \f$ * -# \f$HH^{16}O v2 \f$ - * -# \f$HH^{18}O \f$ - * -# \f$HH^{17}O \f$ - * -# \f$HDO\f$ - * -# \f$^{16}O^{16}O^{16}O\f$ - * -# \f$^{16}O^{16}O^{16}O v2\f$ + * -# \f$HH^{18}O \f$ + * -# \f$HH^{17}O \f$ + * -# \f$HDO\f$ + * -# \f$^{16}O^{16}O^{16}O\f$ + * -# \f$^{16}O^{16}O^{16}O v2\f$ * -# \f$^{16}O^{16}O^{16}O v1\f$ - * -# \f$^{16}O^{16}O^{16}O v3 \f$ - * -# \f$^{16}O^{16}O^{18}O \f$ - * -# \f$^{16}O^{16}O^{17}O \f$ - * -# \f$^{16}O^{18}O^{16}O \f$ + * -# \f$^{16}O^{16}O^{16}O v3 \f$ + * -# \f$^{16}O^{16}O^{18}O \f$ + * -# \f$^{16}O^{16}O^{17}O \f$ + * -# \f$^{16}O^{18}O^{16}O \f$ * -# \f$^{16}O^{17}O^{16}O \f$ */ class RefractiveIndex @@ -103,32 +103,32 @@ class RefractiveIndex //@{ - + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$g=O_2\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ std::complex getRefractivity_o2(double temperature,double pressure, double wvpressure,double frequency); /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$g=O_2\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, - frequency in GHz, width (channel width around frequency) in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, + frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ std::complex getRefractivity_o2(double temperature,double pressure,double wvpressure, - double frequency,double width,unsigned int n); - + double frequency,double width,size_t n); + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$g=H_2O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ std::complex getRefractivity_h2o(double temperature, double pressure, double wvpressure, double frequency); /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$g=H_2O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, - frequency in GHz, width (channel width around frequency) in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, + frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ std::complex getRefractivity_h2o(double temperature,double pressure,double wvpressure, - double frequency,double width,unsigned int n); + double frequency,double width,size_t n); @@ -141,25 +141,25 @@ class RefractiveIndex std::complex getSpecificRefractivity_o3(double temperature,double pressure,double frequency); /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$g=O_3\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width) */ std::complex getSpecificRefractivity_o3(double temperature,double pressure,double frequency, - double width,unsigned int n); + double width,size_t n); /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$g=O_3\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$O_3\f$ m\f$^{-3}\f$ */ inline std::complex getRefractivity_o3(double temperature, double pressure, double frequency, double numberdensity) {return getSpecificRefractivity_o3(temperature, pressure, frequency) * numberdensity;} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$g=O_3\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$O_3\f$ m\f$^{-3}\f$ */ std::complex getRefractivity_o3(double temperature,double pressure,double frequency, - double width,unsigned int n,double numberdensity) + double width,size_t n,double numberdensity) {return getSpecificRefractivity_o3(temperature, pressure, frequency, width, n) * numberdensity;} @@ -170,27 +170,27 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{16}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o16o(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=1; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=1; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - inline std::complex getSpecificRefractivity_16o16o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=1; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + inline std::complex getSpecificRefractivity_16o16o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=1; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{16}O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o16o(double temperature,double pressure,double wvpressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o16o(temperature, pressure, wvpressure, frequency)* numberdensity;} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{16}O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o16o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o16o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o16o(temperature, pressure, wvpressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ @@ -199,34 +199,34 @@ class RefractiveIndex /************************** 16o16o_vib (species 2) ***********************************************************/ - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for the first vibrationally excited state + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for the first vibrationally excited state of \f$^{16}O^{16}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o16o_vib(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=2; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=2; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for the first vibrationally excited state + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for the first vibrationally excited state of \f$^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - inline std::complex getSpecificRefractivity_16o16o_vib(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=2; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + inline std::complex getSpecificRefractivity_16o16o_vib(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=2; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for the first vibrationally excited state + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for the first vibrationally excited state of \f$^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, and numberdensity in molecules of vibrationally excited \f$^{16}O^{16}O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o16o_vib(double temperature,double pressure,double wvpressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o16o_vib(temperature, pressure, wvpressure, frequency)* numberdensity;} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for the first vibrationally excited state + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for the first vibrationally excited state of \f$^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of vibrationally excited \f$^{16}O^{16}O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o16o_vib(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o16o_vib(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o16o_vib(temperature, pressure, wvpressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ @@ -238,94 +238,94 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{18}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o18o(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=3; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=3; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{18}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - inline std::complex getSpecificRefractivity_16o18o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=3; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + inline std::complex getSpecificRefractivity_16o18o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=3; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{18}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{18}O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o18o(double temperature,double pressure,double wvpressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o18o(temperature, pressure, wvpressure, frequency)* numberdensity;} - + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{18}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{18}O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o18o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o18o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o18o(temperature, pressure, wvpressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ - + /************************** 16o17o (species 4) ***************************************************************/ /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{17}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o17o(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=4; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} - + {size_t species=4; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{17}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - inline std::complex getSpecificRefractivity_16o17o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=4; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + inline std::complex getSpecificRefractivity_16o17o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=4; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{17}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{17}O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o17o(double temperature,double pressure,double wvpressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o17o(temperature, pressure, wvpressure, frequency)* numberdensity;} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{17}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{17}O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o17o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o17o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o17o(temperature, pressure, wvpressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ - + /************************** co (species 5) *******************************************************************/ /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$CO\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_co(double temperature,double pressure,double frequency) - {unsigned int species=5; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - + {size_t species=5; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$CO\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_co(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=5; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - - + std::complex getSpecificRefractivity_co(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=5; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$CO\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$CO\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_co(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_co(temperature, pressure, frequency)* numberdensity;} - + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$CO\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$CO\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_co(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_co(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_co(temperature, pressure, frequency, width, n)* numberdensity;} - + /*************************************************************************************************************/ @@ -336,28 +336,28 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$N_2O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_n2o(double temperature,double pressure,double frequency) - {unsigned int species=6; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - + {size_t species=6; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$N_2O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_n2o(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=6; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - - + std::complex getSpecificRefractivity_n2o(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=6; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$N_2O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$N_2O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_n2o(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_no2(temperature, pressure, frequency)* numberdensity;} - + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$N_2O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$N_2O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_n2o(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_n2o(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_no2(temperature, pressure, frequency, width, n)* numberdensity;} - + /*************************************************************************************************************/ @@ -368,29 +368,29 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$NO_2\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_no2(double temperature,double pressure,double frequency) - {unsigned int species=7; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - + {size_t species=7; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$NO_2\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_no2(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=7; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - - + std::complex getSpecificRefractivity_no2(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=7; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$NO_2\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$NO_2\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_no2(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_no2(temperature, pressure, frequency)* numberdensity;} - + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$NO_2\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$NO_2\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_no2(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_no2(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_no2(temperature, pressure, frequency, width, n)* numberdensity;} - + /*************************************************************************************************************/ @@ -400,46 +400,46 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$SO_2\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_so2(double temperature,double pressure,double frequency) - {unsigned int species=8; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - + {size_t species=8; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$SO_2\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_so2(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=8; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - - + std::complex getSpecificRefractivity_so2(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=8; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$SO_2\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$SO_2\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_so2(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_so2(temperature, pressure, frequency)* numberdensity;} - + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$SO_2\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$SO_2\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_so2(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_so2(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_so2(temperature, pressure, frequency, width, n)* numberdensity;} - + /*************************************************************************************************************/ - + /************************** cnth2o (species 9) ***************************************************************/ - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ corresponding to the contribution of + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ corresponding to the contribution of the "wet" collision induced (\f$O_2-H_2O\f$ and \f$N_2-H_2O\f$) processes (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_cnth2o(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=9; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=9; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ corresponding to the contribution of + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ corresponding to the contribution of the "wet" collision induced (\f$O_2-H_2O\f$ and \f$N_2-H_2O\f$) processes (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_cnth2o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=9; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + std::complex getSpecificRefractivity_cnth2o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=9; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} /*************************************************************************************************************/ @@ -448,18 +448,18 @@ class RefractiveIndex /************************** cntdry (species 10) **************************************************************/ - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ corresponding to the contribution of + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ corresponding to the contribution of the "dry" collision induced (\f$O_2-O_2\f$, \f$N_2-N_2\f$ and \f$N_2-O_2\f$) processes (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_cntdry(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=10; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=10; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ corresponding to the contribution of + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ corresponding to the contribution of the "dry" collision induced (\f$O_2-O_2\f$, \f$N_2-N_2\f$ and \f$N_2-O_2\f$) processes (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, - width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_cntdry(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=10; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ + std::complex getSpecificRefractivity_cntdry(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=10; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} /*************************************************************************************************************/ @@ -467,17 +467,17 @@ class RefractiveIndex /************************** hh16o (species 11) ***************************************************************/ - + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$H_2^{16}\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_hh16o(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=11; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=11; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$H_2^{16}\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_hh16o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=11; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + std::complex getSpecificRefractivity_hh16o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=11; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} /*************************************************************************************************************/ @@ -487,13 +487,13 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for the v2 vibrational state of \f$H_2^{16}\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_hh16o_v2(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=12; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=12; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for the v2 vibrational state of \f$H_2^{16}\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_hh16o_v2(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=12; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + std::complex getSpecificRefractivity_hh16o_v2(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=12; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} /*************************************************************************************************************/ @@ -503,15 +503,15 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$H_2^{18}\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_hh18o(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=13; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=13; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$H_2^{18}\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_hh18o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=13; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + std::complex getSpecificRefractivity_hh18o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=13; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + - /*************************************************************************************************************/ @@ -520,15 +520,15 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$H_2^{17}\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_hh17o(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=14; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=14; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$H_2^{17}\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_hh17o(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=14; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + std::complex getSpecificRefractivity_hh17o(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=14; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + - /*************************************************************************************************************/ @@ -537,15 +537,15 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$HDO\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_hdo(double temperature,double pressure,double wvpressure,double frequency) - {unsigned int species=15; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} + {size_t species=15; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$HDO\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, wvpressure (water vapor partial pressure) in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_hdo(double temperature,double pressure,double wvpressure,double frequency,double width,unsigned int n) - {unsigned int species=15; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + std::complex getSpecificRefractivity_hdo(double temperature,double pressure,double wvpressure,double frequency,double width,size_t n) + {size_t species=15; return mkSpecificRefractivity(species, temperature, pressure, wvpressure, frequency, width, n);} + - /*************************************************************************************************************/ @@ -556,64 +556,64 @@ class RefractiveIndex /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o16o16o(double temperature,double pressure,double frequency) - {unsigned int species=16; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - + {size_t species=16; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_16o16o16o(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=16; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - - + std::complex getSpecificRefractivity_16o16o16o(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=16; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$O_3\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o16o16o(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o16o16o(temperature, pressure, frequency)* numberdensity;} - - + + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$O_3\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o16o16o(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o16o16o(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o16o16o(temperature, pressure, frequency, width, n)* numberdensity;} - + /*************************************************************************************************************/ - + /************************** 16o16o16o v2 (species 17) *********************************************************/ - + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for vibrationally excited (v2 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o16o16o_v2(double temperature,double pressure,double frequency) - {unsigned int species=17; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - + {size_t species=17; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for vibrationally excited (v2 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_16o16o16o_v2(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=17; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - + std::complex getSpecificRefractivity_16o16o16o_v2(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=17; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for vibrationally excited (v2 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{16}O^{16}O\f$ \f$v=2\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o16o16o_v2(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o16o16o_v2(temperature, pressure, frequency)* numberdensity;} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for vibrationally excited (v2 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{16}O^{16}O\f$ \f$v=2\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o16o16o_v2(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o16o16o_v2(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o16o16o_v2(temperature, pressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ @@ -621,41 +621,41 @@ class RefractiveIndex /************************** 16o16o16o v1 (species 18) *********************************************************/ - + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for vibrationally excited (v1 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o16o16o_v1(double temperature,double pressure,double frequency) - {unsigned int species=18; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + {size_t species=18; return mkSpecificRefractivity(species, temperature, pressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for vibrationally excited (v1 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_16o16o16o_v1(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=18; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + std::complex getSpecificRefractivity_16o16o16o_v1(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=18; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for vibrationally excited (v1 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{16}O^{16}O\f$ \f$v=1\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o16o16o_v1(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o16o16o_v1(temperature, pressure, frequency)* numberdensity;} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for vibrationally excited (v1 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{16}O^{16}O\f$ \f$v=1\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o16o16o_v1(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o16o16o_v1(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o16o16o_v1(temperature, pressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ - + /************************** 16o16o16o v3 (species 19) *********************************************************/ @@ -663,28 +663,28 @@ class RefractiveIndex \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o16o16o_v3(double temperature,double pressure,double frequency) - {unsigned int species=19; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + {size_t species=19; return mkSpecificRefractivity(species, temperature, pressure, frequency);} /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for vibrationally excited (v3 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_16o16o16o_v3(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=19; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + std::complex getSpecificRefractivity_16o16o16o_v3(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=19; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for vibrationally excited (v3 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{16}O^{16}O\f$ \f$v=3\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o16o16o_v3(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o16o16o_v3(temperature, pressure, frequency)* numberdensity;} /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for vibrationally excited (v3 state) \f$^{16}O^{16}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{16}O^{16}O\f$ \f$v=3\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o16o16o_v3(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o16o16o_v3(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o16o16o_v3(temperature, pressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ @@ -694,33 +694,33 @@ class RefractiveIndex /************************** 16o16o18o (species 20) *********************************************************/ - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{16}O^{18}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o16o18o(double temperature,double pressure,double frequency) - {unsigned int species=20; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + {size_t species=20; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{16}O^{18}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_16o16o18o(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=20; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + std::complex getSpecificRefractivity_16o16o18o(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=20; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{16}O^{18}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{16}O^{18}O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o16o18o(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o16o18o(temperature, pressure, frequency)* numberdensity;} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{16}O^{18}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{16}O^{18}O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o16o18o(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o16o18o(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o16o18o(temperature, pressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ @@ -729,33 +729,33 @@ class RefractiveIndex /************************** 16o16o17o (species 21) *********************************************************/ - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{16}O^{17}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o16o17o(double temperature,double pressure,double frequency) - {unsigned int species=21; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + {size_t species=21; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{16}O^{17}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_16o16o17o(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=21; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + std::complex getSpecificRefractivity_16o16o17o(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=21; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{16}O^{17}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{16}O^{17}O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o16o17o(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o16o17o(temperature, pressure, frequency)* numberdensity;} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{16}O^{17}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{16}O^{17}O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o16o17o(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o16o17o(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o16o17o(temperature, pressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ @@ -764,32 +764,32 @@ class RefractiveIndex /************************** 16o18o16o (species 22) *********************************************************/ - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{18}O^{16}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o18o16o(double temperature,double pressure,double frequency) - {unsigned int species=22; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + {size_t species=22; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{18}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_16o18o16o(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=22; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + std::complex getSpecificRefractivity_16o18o16o(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=22; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{18}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{18}O^{16}O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o18o16o(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o18o16o(temperature, pressure, frequency)* numberdensity;} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{18}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{18}O^{16}O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o18o16o(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o18o16o(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o18o16o(temperature, pressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ @@ -798,47 +798,47 @@ class RefractiveIndex /************************** 16o17o16o (species 23) *********************************************************/ - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{17}O^{16}O\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ inline std::complex getSpecificRefractivity_16o17o16o(double temperature,double pressure,double frequency) - {unsigned int species=22; return mkSpecificRefractivity(species, temperature, pressure, frequency);} + {size_t species=22; return mkSpecificRefractivity(species, temperature, pressure, frequency);} - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$^{16}O^{17}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, width (channel width around frequency) in GHz, and n (number of frequency points for averaging within width). */ - std::complex getSpecificRefractivity_16o17o16o(double temperature,double pressure,double frequency,double width,unsigned int n) - {unsigned int species=22; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} + std::complex getSpecificRefractivity_16o17o16o(double temperature,double pressure,double frequency,double width,size_t n) + {size_t species=22; return mkSpecificRefractivity(species, temperature, pressure, frequency, width, n);} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{17}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$^{16}O^{17}O^{16}O\f$ m\f$^{-3}\f$. */ inline std::complex getRefractivity_16o17o16o(double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity_16o17o16o(temperature, pressure, frequency)* numberdensity;} - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$^{16}O^{17}O^{16}O\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, - width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), + The parameters are temperature in K, pressure in hPa, frequency in GHz, + width (channel width around frequency) in GHz, n (number of frequency points for averaging within width), and numberdensity in molecules of \f$^{16}O^{17}O^{16}O\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity_16o17o16o(double temperature,double pressure,double frequency,double width,unsigned int n,double numberdensity) + std::complex getRefractivity_16o17o16o(double temperature,double pressure,double frequency,double width,size_t n,double numberdensity) {return getSpecificRefractivity_16o17o16o(temperature, pressure, frequency, width, n)* numberdensity;} /*************************************************************************************************************/ - /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for + /** It returns \f$(2\pi\nu/c)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{-1},m^{-1})\f$ for \f$species\f$ (see \ref definitions)
- The parameters are temperature in K, pressure in hPa, frequency in GHz, + The parameters are temperature in K, pressure in hPa, frequency in GHz, and numberdensity in molecules of \f$species\f$ m\f$^{-3}\f$. */ - std::complex getRefractivity(unsigned int species,double temperature,double pressure,double frequency,double numberdensity) + std::complex getRefractivity(size_t species,double temperature,double pressure,double frequency,double numberdensity) {return getSpecificRefractivity(species, temperature, pressure, frequency)* numberdensity;} - /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for + /** It returns \f$(2\pi\nu/c\rho_g)\cdot(N_{rg}+iN_{ig})\f$ with units \f$(rad\cdot m^{2},m^{2})\f$ for \f$species\f$ (see \ref definitions)
The parameters are temperature in K, pressure in hPa, and frequency in GHz. */ - std::complex getSpecificRefractivity(unsigned int species,double temperature,double pressure,double frequency) + std::complex getSpecificRefractivity(size_t species,double temperature,double pressure,double frequency) {return mkSpecificRefractivity(species, temperature, pressure, frequency);} @@ -847,23 +847,23 @@ class RefractiveIndex private: - std::complex mkSpecificRefractivity(unsigned int species, // species --> 1 to 23 - double temperature, + std::complex mkSpecificRefractivity(size_t species, // species --> 1 to 23 + double temperature, double pressure, double wvpressure, double frequency); - std::complex mkSpecificRefractivity(unsigned int species, double temperature, double pressure, double frequency){return mkSpecificRefractivity(species, temperature, pressure, double(0.0), frequency);} + std::complex mkSpecificRefractivity(size_t species, double temperature, double pressure, double frequency){return mkSpecificRefractivity(species, temperature, pressure, double(0.0), frequency);} - std::complex mkSpecificRefractivity(unsigned int species, // species --> 1 to 23 - double temperature, + std::complex mkSpecificRefractivity(size_t species, // species --> 1 to 23 + double temperature, double pressure, double wvpressure, double frequency, double width, - unsigned int n); + size_t n); - std::complex mkSpecificRefractivity(unsigned int species, double temperature, double pressure, double frequency, double width, unsigned int n){return mkSpecificRefractivity(species, temperature, pressure, double(0.0), frequency, width, n);} + std::complex mkSpecificRefractivity(size_t species, double temperature, double pressure, double frequency, double width, size_t n){return mkSpecificRefractivity(species, temperature, pressure, double(0.0), frequency, width, n);} std::complex mkSpecificRefractivity_16o16o(double temperature, /// 1 double pressure, @@ -946,7 +946,7 @@ class RefractiveIndex double pressure, double frequency); - unsigned int vpIndex(double nu); + size_t vpIndex(double nu); double linebroadening(double frequency, double temperature, double pressure, diff --git a/src/libaatm/include/ATMRefractiveIndexProfile.h b/src/libaatm/include/ATMRefractiveIndexProfile.h index e27cd19..b0cf5f2 100644 --- a/src/libaatm/include/ATMRefractiveIndexProfile.h +++ b/src/libaatm/include/ATMRefractiveIndexProfile.h @@ -49,7 +49,7 @@ ATM_NAMESPACE_BEGIN * The absorption coefficient in each layer can be used * later for radiative transfer purposes. The atmospheric P/T/gas profile is inherited * from an object of type AtmProfile. The absorption coefficient profile - * is provided separately for O2 lines, H2O lines, CO lines, O3 lines, N2O lines, NO2 lines, + * is provided separately for O2 lines, H2O lines, CO lines, O3 lines, N2O lines, NO2 lines, * SO2 lines dry and wet continuum. The total absorption coefficient profile (addition of * those just described) is also available, since it is the only profile really needed * for the WaterVaporRetrieval class which derives from this @@ -109,8 +109,8 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid //@{ /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - inline void addNewSpectralWindow(unsigned int numChan, - unsigned int refChan, + inline void addNewSpectralWindow(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep) { @@ -118,8 +118,8 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid mkRefractiveIndexProfile(); } /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - inline void addNewSpectralWindow(unsigned int numChan, - unsigned int refChan, + inline void addNewSpectralWindow(size_t numChan, + size_t refChan, double* chanFreq, const string &freqUnits) { @@ -127,7 +127,7 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid mkRefractiveIndexProfile(); } /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - inline void addNewSpectralWindow(unsigned int numChan, + inline void addNewSpectralWindow(size_t numChan, double refFreq, double* chanFreq, const string &freqUnits) @@ -136,7 +136,7 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid mkRefractiveIndexProfile(); } /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - inline void addNewSpectralWindow(unsigned int numChan, + inline void addNewSpectralWindow(size_t numChan, double refFreq, const vector &chanFreq, const string &freqUnits) @@ -145,8 +145,8 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid mkRefractiveIndexProfile(); } /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - inline void addNewSpectralWindow(unsigned int numChan, - unsigned int refChan, + inline void addNewSpectralWindow(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep, const Frequency &intermediateFreq, @@ -169,7 +169,7 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid } /** Accessor to total number of Frequency points in the SpectralGrid object */ - inline unsigned int getNumIndividualFrequencies() const + inline size_t getNumIndividualFrequencies() const { return v_chanFreq_.size(); } @@ -192,176 +192,176 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid //@{ /** Accessor to get H2O lines Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsH2OLines(unsigned int nl) const + InverseLength getAbsH2OLines(size_t nl) const { return InverseLength(imag((vv_N_H2OLinesPtr_[0]->at(nl))), "m-1"); } /** Accessor to get H2O lines Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsH2OLines(unsigned int nf, unsigned int nl) const + InverseLength getAbsH2OLines(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_H2OLinesPtr_[nf]->at(nl))), "m-1"); } /** Accessor to get H2O Continuum Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsH2OLines(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsH2OLines(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_H2OLinesPtr_[j]->at(nl))), "m-1"); } /** Accessor to get H2O Continuum Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsH2OCont(unsigned int nl) const + InverseLength getAbsH2OCont(size_t nl) const { return InverseLength(imag((vv_N_H2OContPtr_[0]->at(nl))), "m-1"); } /** Accessor to get H2O Continuum Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsH2OCont(unsigned int nf, unsigned int nl) const + InverseLength getAbsH2OCont(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_H2OContPtr_[nf]->at(nl))), "m-1"); } /** Accessor to get H2O Continuum Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsH2OCont(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsH2OCont(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_H2OContPtr_[j]->at(nl))), "m-1"); } /** Function to retrieve O2 lines Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsO2Lines(unsigned int nl) const + InverseLength getAbsO2Lines(size_t nl) const { return InverseLength(imag((vv_N_O2LinesPtr_[0]->at(nl))), "m-1"); } /** Function to retrieve O2 lines Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsO2Lines(unsigned int nf, unsigned int nl) const + InverseLength getAbsO2Lines(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_O2LinesPtr_[nf]->at(nl))), "m-1"); } /** Function to retrieve O2 lines Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsO2Lines(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsO2Lines(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_O2LinesPtr_[j]->at(nl))), "m-1"); } /** Function to retrieve Dry continuum Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsDryCont(unsigned int nl) const + InverseLength getAbsDryCont(size_t nl) const { return InverseLength(imag((vv_N_DryContPtr_[0]->at(nl))), "m-1"); } /** Function to retrieve Dry continuum Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsDryCont(unsigned int nf, unsigned int nl) const + InverseLength getAbsDryCont(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_DryContPtr_[nf]->at(nl))), "m-1"); } /** Function to retrieve Dry continuum Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsDryCont(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsDryCont(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_DryContPtr_[j]->at(nl))), "m-1"); } /** Function to retrieve O3 lines Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsO3Lines(unsigned int nl) const + InverseLength getAbsO3Lines(size_t nl) const { return InverseLength(imag((vv_N_O3LinesPtr_[0]->at(nl))), "m-1"); } /** Function to retrieve O3 lines Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsO3Lines(unsigned int nf, unsigned int nl) const + InverseLength getAbsO3Lines(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_O3LinesPtr_[nf]->at(nl))), "m-1"); } /** Function to retrieve O3 lines Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsO3Lines(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsO3Lines(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_O3LinesPtr_[j]->at(nl))), "m-1"); } /** Function to retrieve CO lines Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsCOLines(unsigned int nl) const + InverseLength getAbsCOLines(size_t nl) const { return InverseLength(imag((vv_N_COLinesPtr_[0]->at(nl))), "m-1"); } /** Function to retrieve CO lines Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsCOLines(unsigned int nf, unsigned int nl) const + InverseLength getAbsCOLines(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_COLinesPtr_[nf]->at(nl))), "m-1"); } /** Function to retrieve CO lines Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsCOLines(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsCOLines(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_COLinesPtr_[j]->at(nl))), "m-1"); } /** Function to retrieve N2O lines Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsN2OLines(unsigned int nl) const + InverseLength getAbsN2OLines(size_t nl) const { return InverseLength(imag((vv_N_N2OLinesPtr_[0]->at(nl))), "m-1"); } /** Function to retrieve N2O lines Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsN2OLines(unsigned int nf, unsigned int nl) const + InverseLength getAbsN2OLines(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_N2OLinesPtr_[nf]->at(nl))), "m-1"); } /** Function to retrieve N2O lines Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsN2OLines(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsN2OLines(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_N2OLinesPtr_[j]->at(nl))), "m-1"); } /** Function to retrieve NO2 lines Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsNO2Lines(unsigned int nl) const + InverseLength getAbsNO2Lines(size_t nl) const { return InverseLength(imag((vv_N_NO2LinesPtr_[0]->at(nl))), "m-1"); } /** Function to retrieve NO2 lines Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsNO2Lines(unsigned int nf, unsigned int nl) const + InverseLength getAbsNO2Lines(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_NO2LinesPtr_[nf]->at(nl))), "m-1"); } /** Function to retrieve NO2 lines Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsNO2Lines(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsNO2Lines(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_NO2LinesPtr_[j]->at(nl))), "m-1"); } /** Function to retrieve SO2 lines Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsSO2Lines(unsigned int nl) const + InverseLength getAbsSO2Lines(size_t nl) const { return InverseLength(imag((vv_N_SO2LinesPtr_[0]->at(nl))), "m-1"); } /** Function to retrieve SO2 lines Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsSO2Lines(unsigned int nf, unsigned int nl) const + InverseLength getAbsSO2Lines(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_SO2LinesPtr_[nf]->at(nl))), "m-1"); } /** Function to retrieve SO2 lines Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsSO2Lines(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsSO2Lines(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_SO2LinesPtr_[j]->at(nl))), "m-1"); } @@ -370,12 +370,12 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve total Dry Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsTotalDry(unsigned int nl) const + InverseLength getAbsTotalDry(size_t nl) const { return getAbsTotalDry(nl, 0); } /** Function to retrieve total Dry Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsTotalDry(unsigned int nf, unsigned int nl) const + InverseLength getAbsTotalDry(size_t nf, size_t nl) const { return InverseLength(imag( vv_N_O2LinesPtr_[nf]->at(nl) @@ -384,11 +384,11 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid + vv_N_NO2LinesPtr_[nf]->at(nl) + vv_N_SO2LinesPtr_[nf]->at(nl)), "m-1"); } /** Function to retrieve total Dry Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsTotalDry(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsTotalDry(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag( vv_N_O2LinesPtr_[j]->at(nl) + vv_N_DryContPtr_[j]->at(nl) + vv_N_O3LinesPtr_[j]->at(nl) @@ -397,106 +397,106 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid } /** Function to retrieve total Wet Absorption Coefficient at layer nl, for single frequency RefractiveIndexProfile object */ - InverseLength getAbsTotalWet(unsigned int nl) const + InverseLength getAbsTotalWet(size_t nl) const { return getAbsTotalWet(nl, 0); } /** Function to retrieve total Wet Absorption Coefficient at layer nl and frequency channel nf, for RefractiveIndexProfile object with a spectral grid */ - InverseLength getAbsTotalWet(unsigned int nf, unsigned int nl) const + InverseLength getAbsTotalWet(size_t nf, size_t nl) const { return InverseLength(imag((vv_N_H2OLinesPtr_[nf]->at(nl) + vv_N_H2OContPtr_[nf]->at(nl))), "m-1"); } /** Function to retrieve total Wet Absorption Coefficient at layer nl, spectral window spwid and channel nf */ - InverseLength getAbsTotalWet(unsigned int spwid, - unsigned int nf, - unsigned int nl) const + InverseLength getAbsTotalWet(size_t spwid, + size_t nf, + size_t nl) const { - unsigned int j = v_transfertId_[spwid] + nf; + size_t j = v_transfertId_[spwid] + nf; return InverseLength(imag((vv_N_H2OLinesPtr_[j]->at(nl) + vv_N_H2OContPtr_[j]->at(nl))), "m-1"); } - Opacity getAverageO2LinesOpacity(unsigned int spwid); - Opacity getAverageO3LinesOpacity(unsigned int spwid); - Opacity getAverageN2OLinesOpacity(unsigned int spwid); - Opacity getAverageNO2LinesOpacity(unsigned int spwid); - Opacity getAverageSO2LinesOpacity(unsigned int spwid); - Opacity getAverageCOLinesOpacity(unsigned int spwid); - Opacity getAverageDryContOpacity(unsigned int spwid); + Opacity getAverageO2LinesOpacity(size_t spwid); + Opacity getAverageO3LinesOpacity(size_t spwid); + Opacity getAverageN2OLinesOpacity(size_t spwid); + Opacity getAverageNO2LinesOpacity(size_t spwid); + Opacity getAverageSO2LinesOpacity(size_t spwid); + Opacity getAverageCOLinesOpacity(size_t spwid); + Opacity getAverageDryContOpacity(size_t spwid); /** Function to retrieve the integrated Dry Opacity along the atmospheric path for single frequency RefractiveIndexProfile object */ Opacity getDryOpacity(){return getDryOpacity(0);} Opacity getDryOpacityUpTo(Length refalti){return getDryOpacityUpTo(0,refalti);} /** Function to retrieve the integrated Dry Opacity along the atmospheric path for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getDryOpacity(unsigned int nc); - Opacity getDryOpacityUpTo(unsigned int nc, Length refalti); - Opacity getDryOpacity(unsigned int spwid, unsigned int nc){ if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getDryOpacity(v_transfertId_[spwid] + nc);} - Opacity getDryOpacityUpTo(unsigned int spwid, unsigned int nc, Length refalti) + Opacity getDryOpacity(size_t nc); + Opacity getDryOpacityUpTo(size_t nc, Length refalti); + Opacity getDryOpacity(size_t spwid, size_t nc){ if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getDryOpacity(v_transfertId_[spwid] + nc);} + Opacity getDryOpacityUpTo(size_t spwid, size_t nc, Length refalti) { if(!spwidAndIndexAreValid(spwid, nc))return Opacity(-999.0); return getDryOpacityUpTo(v_transfertId_[spwid] + nc, refalti); } - Opacity getAverageDryOpacity(unsigned int spwid); + Opacity getAverageDryOpacity(size_t spwid); /** Function to retrieve the integrated Dry Continuum Opacity along the atmospheric path for single frequency RefractiveIndexProfile object */ Opacity getDryContOpacity(); /** Function to retrieve the integrated Dry Continuum Opacity along the atmospheric path for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getDryContOpacity(unsigned int nc); - Opacity getDryContOpacity(unsigned int spwid, unsigned int nc); + Opacity getDryContOpacity(size_t nc); + Opacity getDryContOpacity(size_t spwid, size_t nc); /** Function to retrieve the integrated O2 Lines Opacity along the atmospheric path for single frequency RefractiveIndexProfile object */ Opacity getO2LinesOpacity(); /** Function to retrieve the integrated O2 Lines Opacity along the atmospheric path for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getO2LinesOpacity(unsigned int nc); - Opacity getO2LinesOpacity(unsigned int spwid, unsigned int nc); + Opacity getO2LinesOpacity(size_t nc); + Opacity getO2LinesOpacity(size_t spwid, size_t nc); /** Function to retrieve the integrated O3 Lines Opacity along the atmospheric path for single frequency RefractiveIndexProfile object */ Opacity getO3LinesOpacity(); /** Function to retrieve the integrated O3 Lines Opacity along the atmospheric path for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getO3LinesOpacity(unsigned int nc); - Opacity getO3LinesOpacity(unsigned int spwid, unsigned int nc); + Opacity getO3LinesOpacity(size_t nc); + Opacity getO3LinesOpacity(size_t spwid, size_t nc); /** Function to retrieve the integrated CO Lines Opacity along the atmospheric path for single frequency RefractiveIndexProfile object */ Opacity getCOLinesOpacity(); /** Function to retrieve the integrated CO Lines Opacity along the atmospheric path for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getCOLinesOpacity(unsigned int nc); - Opacity getCOLinesOpacity(unsigned int spwid, unsigned int nc); + Opacity getCOLinesOpacity(size_t nc); + Opacity getCOLinesOpacity(size_t spwid, size_t nc); /** Function to retrieve the integrated N2O Lines Opacity along the atmospheric path for single frequency RefractiveIndexProfile object */ Opacity getN2OLinesOpacity(); /** Function to retrieve the integrated N2O Lines Opacity along the atmospheric path for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getN2OLinesOpacity(unsigned int nc); - Opacity getN2OLinesOpacity(unsigned int spwid, unsigned int nc); + Opacity getN2OLinesOpacity(size_t nc); + Opacity getN2OLinesOpacity(size_t spwid, size_t nc); /** Function to retrieve the integrated NO2 Lines Opacity along the atmospheric path for single frequency RefractiveIndexProfile object */ Opacity getNO2LinesOpacity(); /** Function to retrieve the integrated NO2 Lines Opacity along the atmospheric path for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getNO2LinesOpacity(unsigned int nc); - Opacity getNO2LinesOpacity(unsigned int spwid, unsigned int nc); + Opacity getNO2LinesOpacity(size_t nc); + Opacity getNO2LinesOpacity(size_t spwid, size_t nc); /** Function to retrieve the integrated SO2 Lines Opacity along the atmospheric path for single frequency RefractiveIndexProfile object */ Opacity getSO2LinesOpacity(); /** Function to retrieve the integrated SO2 Lines Opacity along the atmospheric path for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getSO2LinesOpacity(unsigned int nc); - Opacity getSO2LinesOpacity(unsigned int spwid, unsigned int nc); + Opacity getSO2LinesOpacity(size_t nc); + Opacity getSO2LinesOpacity(size_t spwid, size_t nc); /** Function to retrieve the integrated Wet Opacity along the atmospheric path corresponding to the 1st guess water column (from AtmProfile object) or the for single frequency RefractiveIndexProfile object */ Opacity getWetOpacity() {return getWetOpacity(getGroundWH2O());} - /** Function to retrieve the integrated Wet Opacity along the atmospheric path + /** Function to retrieve the integrated Wet Opacity along the atmospheric path for a given integratedwatercolumn */ Opacity getWetOpacity(const Length &integratedwatercolumn); /** Function to retrieve the integrated Wet Opacity along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getWetOpacity(const Length &integratedwatercolumn, unsigned int nc); + Opacity getWetOpacity(const Length &integratedwatercolumn, size_t nc); /** Function to retrieve the integrated Wet Opacity along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getWetOpacity(const Length &integratedwatercolumn, unsigned int spwid, unsigned int nc); + Opacity getWetOpacity(const Length &integratedwatercolumn, size_t spwid, size_t nc); /** Function to retrieve the integrated H2O Lines Opacity along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object */ - + /** Function to retrieve the integrated H2O Lines Opacity along the atmospheric path corresponding to the 1st guess water column (from AtmProfile object) */ Opacity getH2OLinesOpacity() {return getH2OLinesOpacity(getGroundWH2O());} @@ -506,11 +506,11 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated H2O Lines Opacity along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getH2OLinesOpacity(const Length &integratedwatercolumn, unsigned int nc); + Opacity getH2OLinesOpacity(const Length &integratedwatercolumn, size_t nc); /** Function to retrieve the integrated H2O Lines Opacity along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object of a spectral window */ - Opacity getH2OLinesOpacity(const Length &integratedwatercolumn, unsigned int spwid, unsigned int nc); + Opacity getH2OLinesOpacity(const Length &integratedwatercolumn, size_t spwid, size_t nc); /** Function to retrieve the integrated H2O Continuum Opacity along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object */ @@ -524,19 +524,19 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated H2O Continuum Opacity along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Opacity getH2OContOpacity(const Length &integratedwatercolumn, unsigned int nc); + Opacity getH2OContOpacity(const Length &integratedwatercolumn, size_t nc); /** Function to retrieve the integrated H2O Continuum Opacity along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object of a spectral window */ - Opacity getH2OContOpacity(const Length &integratedwatercolumn, unsigned int spwid, unsigned int nc); + Opacity getH2OContOpacity(const Length &integratedwatercolumn, size_t spwid, size_t nc); - Opacity getAverageWetOpacity(const Length &integratedwatercolumn, unsigned int spwid); - Opacity getAverageH2OLinesOpacity(const Length &integratedwatercolumn, unsigned int spwid); - Opacity getAverageH2OContOpacity(const Length &integratedwatercolumn, unsigned int spwid); + Opacity getAverageWetOpacity(const Length &integratedwatercolumn, size_t spwid); + Opacity getAverageH2OLinesOpacity(const Length &integratedwatercolumn, size_t spwid); + Opacity getAverageH2OContOpacity(const Length &integratedwatercolumn, size_t spwid); /** Function to retrieve the integrated Atmospheric Phase Delay (Dry part) along the atmospheric path corresponding to a given water vapor column @@ -549,19 +549,19 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (Dry part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getNonDispersiveDryPhaseDelay(unsigned int nc); + Angle getNonDispersiveDryPhaseDelay(size_t nc); /** Function to retrieve the integrated Atmospheric Path length (Dry part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getNonDispersiveDryPathLength(unsigned int nc); + Length getNonDispersiveDryPathLength(size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (Dry part) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getNonDispersiveDryPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getNonDispersiveDryPhaseDelay(size_t spwid, size_t nc); /** Function to retrieve the integrated Atmospheric Path length (Dry part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getNonDispersiveDryPathLength(unsigned int spwid, unsigned int nc); + Length getNonDispersiveDryPathLength(size_t spwid, size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (Dry part) along the atmospheric path corresponding to a given water vapor column @@ -574,28 +574,28 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (Dry part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getDispersiveDryPhaseDelay(unsigned int nc); + Angle getDispersiveDryPhaseDelay(size_t nc); /** Function to retrieve the integrated Atmospheric Path length (Dry part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getDispersiveDryPathLength(unsigned int nc); + Length getDispersiveDryPathLength(size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (Dry part) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getDispersiveDryPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getDispersiveDryPhaseDelay(size_t spwid, size_t nc); /** Function to retrieve the integrated Atmospheric Path length (Dry part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getDispersiveDryPathLength(unsigned int spwid, unsigned int nc); + Length getDispersiveDryPathLength(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (Dry part) in spectral Window spwid */ - Length getAverageNonDispersiveDryPathLength(unsigned int spwid); + Length getAverageNonDispersiveDryPathLength(size_t spwid); /** Function to retrieve the average integrated Atmospheric Path Length (Dry part) in spectral Window spwid */ - Length getAverageDispersiveDryPathLength(unsigned int spwid); + Length getAverageDispersiveDryPathLength(size_t spwid); /** Function to retrieve the average integrated Atmospheric Phase Delay (Dry part) in spectral Window spwid */ - Angle getAverageNonDispersiveDryPhaseDelay(unsigned int spwid); + Angle getAverageNonDispersiveDryPhaseDelay(size_t spwid); /** Function to retrieve the average integrated Atmospheric Phase Delay (Dry part) in spectral Window spwid */ - Angle getAverageDispersiveDryPhaseDelay(unsigned int spwid); + Angle getAverageDispersiveDryPhaseDelay(size_t spwid); /** Function to retrieve the integrated Atmospheric Phase Delay (due to O2 lines) along the atmospheric path corresponding to a given water vapor column @@ -608,23 +608,23 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (due to O2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getO2LinesPhaseDelay(unsigned int nc); + Angle getO2LinesPhaseDelay(size_t nc); /** Function to retrieve the integrated Atmospheric Path length (due to O2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getO2LinesPathLength(unsigned int nc); + Length getO2LinesPathLength(size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (due to O2 Lines) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getO2LinesPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getO2LinesPhaseDelay(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Phase Delay (due to O2 Lines) in spectral Window spwid */ - Angle getAverageO2LinesPhaseDelay(unsigned int spwid); + Angle getAverageO2LinesPhaseDelay(size_t spwid); /** Function to retrieve the integrated Atmospheric Path length (due to O2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getO2LinesPathLength(unsigned int spwid, unsigned int nc); + Length getO2LinesPathLength(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (due to O2 Lines) in spectral Window spwid */ - Length getAverageO2LinesPathLength(unsigned int spwid); + Length getAverageO2LinesPathLength(size_t spwid); /** Function to retrieve the integrated Atmospheric Phase Delay (due to O3 lines) along the atmospheric path corresponding to a given water vapor column @@ -637,23 +637,23 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (due to O3 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getO3LinesPhaseDelay(unsigned int nc); + Angle getO3LinesPhaseDelay(size_t nc); /** Function to retrieve the integrated Atmospheric Path length (due to O3 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getO3LinesPathLength(unsigned int nc); + Length getO3LinesPathLength(size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (due to O3 Lines) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getO3LinesPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getO3LinesPhaseDelay(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Phase Delay (due to O3 Lines) in spectral Window spwid */ - Angle getAverageO3LinesPhaseDelay(unsigned int spwid); + Angle getAverageO3LinesPhaseDelay(size_t spwid); /** Function to retrieve the integrated Atmospheric Path length (due to O3 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getO3LinesPathLength(unsigned int spwid, unsigned int nc); + Length getO3LinesPathLength(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (due to O3 Lines) in spectral Window spwid */ - Length getAverageO3LinesPathLength(unsigned int spwid); + Length getAverageO3LinesPathLength(size_t spwid); /** Function to retrieve the integrated Atmospheric Phase Delay (due to CO lines) along the atmospheric path corresponding to a given water vapor column @@ -666,23 +666,23 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (due to CO Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getCOLinesPhaseDelay(unsigned int nc); + Angle getCOLinesPhaseDelay(size_t nc); /** Function to retrieve the integrated Atmospheric Path length (due to CO Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getCOLinesPathLength(unsigned int nc); + Length getCOLinesPathLength(size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (due to CO Lines) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getCOLinesPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getCOLinesPhaseDelay(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Phase Delay (due to CO Lines) in spectral Window spwid */ - Angle getAverageCOLinesPhaseDelay(unsigned int spwid); + Angle getAverageCOLinesPhaseDelay(size_t spwid); /** Function to retrieve the integrated Atmospheric Path length (due to CO Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getCOLinesPathLength(unsigned int spwid, unsigned int nc); + Length getCOLinesPathLength(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (due to CO Lines) in spectral Window spwid */ - Length getAverageCOLinesPathLength(unsigned int spwid); + Length getAverageCOLinesPathLength(size_t spwid); @@ -698,23 +698,23 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (due to N2O Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getN2OLinesPhaseDelay(unsigned int nc); + Angle getN2OLinesPhaseDelay(size_t nc); /** Function to retrieve the integrated Atmospheric Path length (due to N2O Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getN2OLinesPathLength(unsigned int nc); + Length getN2OLinesPathLength(size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (due to N2O Lines) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getN2OLinesPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getN2OLinesPhaseDelay(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Phase Delay (due to N2O Lines) in spectral Window spwid */ - Angle getAverageN2OLinesPhaseDelay(unsigned int spwid); + Angle getAverageN2OLinesPhaseDelay(size_t spwid); /** Function to retrieve the integrated Atmospheric Path length (due to N2O Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getN2OLinesPathLength(unsigned int spwid, unsigned int nc); + Length getN2OLinesPathLength(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (due to N2O Lines) in spectral Window spwid */ - Length getAverageN2OLinesPathLength(unsigned int spwid); + Length getAverageN2OLinesPathLength(size_t spwid); @@ -729,23 +729,23 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (due to NO2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getNO2LinesPhaseDelay(unsigned int nc); + Angle getNO2LinesPhaseDelay(size_t nc); /** Function to retrieve the integrated Atmospheric Path length (due to NO2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getNO2LinesPathLength(unsigned int nc); + Length getNO2LinesPathLength(size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (due to NO2 Lines) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getNO2LinesPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getNO2LinesPhaseDelay(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Phase Delay (due to NO2 Lines) in spectral Window spwid */ - Angle getAverageNO2LinesPhaseDelay(unsigned int spwid); + Angle getAverageNO2LinesPhaseDelay(size_t spwid); /** Function to retrieve the integrated Atmospheric Path length (due to NO2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getNO2LinesPathLength(unsigned int spwid, unsigned int nc); + Length getNO2LinesPathLength(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (due to NO2 Lines) in spectral Window spwid */ - Length getAverageNO2LinesPathLength(unsigned int spwid); + Length getAverageNO2LinesPathLength(size_t spwid); /** Function to retrieve the integrated Atmospheric Phase Delay (due to SO2 lines) along the atmospheric path @@ -759,23 +759,23 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (due to SO2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getSO2LinesPhaseDelay(unsigned int nc); + Angle getSO2LinesPhaseDelay(size_t nc); /** Function to retrieve the integrated Atmospheric Path length (due to SO2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getSO2LinesPathLength(unsigned int nc); + Length getSO2LinesPathLength(size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (due to SO2 Lines) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getSO2LinesPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getSO2LinesPhaseDelay(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Phase Delay (due to SO2 Lines) in spectral Window spwid */ - Angle getAverageSO2LinesPhaseDelay(unsigned int spwid); + Angle getAverageSO2LinesPhaseDelay(size_t spwid); /** Function to retrieve the integrated Atmospheric Path length (due to SO2 Lines) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getSO2LinesPathLength(unsigned int spwid, unsigned int nc); + Length getSO2LinesPathLength(size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (due to SO2 Lines) in spectral Window spwid */ - Length getAverageSO2LinesPathLength(unsigned int spwid); + Length getAverageSO2LinesPathLength(size_t spwid); @@ -786,7 +786,7 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (Dispersive part) along the atmospheric path - corresponding to the 1st guess water column (from AtmProfile object) + corresponding to the 1st guess water column (from AtmProfile object) for single frequency RefractiveIndexProfile object */ Angle getDispersiveH2OPhaseDelay() {return getDispersiveH2OPhaseDelay(getGroundWH2O());} /** Function to retrieve the integrated Atmospheric Phase Delay (Dispersive part) along the atmospheric path @@ -794,7 +794,7 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid for single frequency RefractiveIndexProfile object */ Angle getDispersiveH2OPhaseDelay(const Length &integratedwatercolumn); /** Function to retrieve the integrated Atmospheric Path length (Dispersive part) along the atmospheric path - corresponding to the 1st guess water column (from AtmProfile object) + corresponding to the 1st guess water column (from AtmProfile object) for single frequency RefractiveIndexProfile object */ Length getDispersiveH2OPathLength() {return getDispersiveH2OPathLength(getGroundWH2O());} /** Function to retrieve the integrated Atmospheric Path length (Dispersive part) along the atmospheric path @@ -804,25 +804,25 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (Dispersive part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, unsigned int nc); + Angle getDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, size_t nc); /** Function to retrieve the integrated Atmospheric Path length (Dispersive part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getDispersiveH2OPathLength(const Length &integratedwatercolumn, unsigned int nc); + Length getDispersiveH2OPathLength(const Length &integratedwatercolumn, size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (Dispersive part) along the atmospheric path corresponding to a given water vapor column for single frequency RefractiveIndexProfile object with several Spectral Grids */ - Angle getDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, unsigned int spwid, unsigned int nc); + Angle getDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Phase Delay (Dispersive part) in spectral Window spwid */ - Angle getAverageDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, unsigned int spwid); + Angle getAverageDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, size_t spwid); /** Function to retrieve the integrated Atmospheric Path length (Dispersive part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with everal Spectral Grids */ - Length getDispersiveH2OPathLength(const Length &integratedwatercolumn, unsigned int spwid, unsigned int nc); + Length getDispersiveH2OPathLength(const Length &integratedwatercolumn, size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (Dispersive part) in spectral Window spwid */ - Length getAverageDispersiveH2OPathLength(const Length &integratedwatercolumn, unsigned int spwid); + Length getAverageDispersiveH2OPathLength(const Length &integratedwatercolumn, size_t spwid); /** Function to retrieve the integrated Atmospheric Phase Delay (Non-Dispersive part) along the atmospheric path - corresponding to the 1st guess water column (from AtmProfile object) + corresponding to the 1st guess water column (from AtmProfile object) for single frequency RefractiveIndexProfile object */ Angle getNonDispersiveH2OPhaseDelay() {return getNonDispersiveH2OPhaseDelay(getGroundWH2O());} /** Function to retrieve the integrated Atmospheric Phase Delay (Non-Dispersive part) along the atmospheric path @@ -830,7 +830,7 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid for single frequency RefractiveIndexProfile object */ Angle getNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn); /** Function to retrieve the integrated Atmospheric Path Length (Non-Dispersive part) along the atmospheric path - corresponding to the 1st guess water column (from AtmProfile object) + corresponding to the 1st guess water column (from AtmProfile object) for single frequency RefractiveIndexProfile object */ Length getNonDispersiveH2OPathLength() {return getNonDispersiveH2OPathLength(getGroundWH2O());} /** Function to retrieve the integrated Atmospheric Path Length (Non-Dispersive part) along the atmospheric path @@ -840,23 +840,23 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid /** Function to retrieve the integrated Atmospheric Phase Delay (Non-Dispersive part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Angle getNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, unsigned int nc); + Angle getNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, size_t nc); /** Function to retrieve the integrated Atmospheric Path Length (Non-Dispersive part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with a spectral grid */ - Length getNonDispersiveH2OPathLength(const Length &integratedwatercolumn, unsigned int nc); + Length getNonDispersiveH2OPathLength(const Length &integratedwatercolumn, size_t nc); /** Function to retrieve the integrated Atmospheric Phase Delay (Non-Dispersive part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with several spectral grids */ - Angle getNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, unsigned int spwid, unsigned int nc); + Angle getNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, size_t spwid, size_t nc); /** Function to retrieve the average integrated Atmospheric Path Length (Non-Dispersive part) in spectral Window spwid */ - Length getAverageNonDispersiveH2OPathLength(const Length &integratedwatercolumn, unsigned int spwid); + Length getAverageNonDispersiveH2OPathLength(const Length &integratedwatercolumn, size_t spwid); /** Function to retrieve the average integrated Atmospheric Phase Delay (Non-Dispersive part) in spectral Window spwid */ - Angle getAverageNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, unsigned int spwid); + Angle getAverageNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, size_t spwid); /** Function to retrieve the integrated Atmospheric Path Length (Non-Dispersive part) along the atmospheric path corresponding to a given water vapor column for channel nc in an RefractiveIndexProfile object with several spectral grids */ - Length getNonDispersiveH2OPathLength(const Length &integratedwatercolumn, unsigned int spwid, unsigned int nc); + Length getNonDispersiveH2OPathLength(const Length &integratedwatercolumn, size_t spwid, size_t nc); void updateNewSpectralWindows(); @@ -900,7 +900,7 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid * which have not yet their profiles determined, then return true, else return true * directly, the object being already up-to-date. */ - bool chanIndexIsValid(unsigned int nc); + bool chanIndexIsValid(size_t nc); /** Method to assess if a channel frequency index of a given spectral window is valid. * @param spwid spectral window identifier * @param nc channel frequency index relative to that spectral window (e.g. if a spectral window has @@ -911,7 +911,7 @@ class RefractiveIndexProfile: public AtmProfile, public SpectralGrid * there was not yet profiles determined for that index, then return true, else return true * directly, the object being already up-to-date. */ - bool spwidAndIndexAreValid(unsigned int spwid, unsigned int idx); + bool spwidAndIndexAreValid(size_t spwid, size_t idx); }; // class RefractiveIndexProfile ATM_NAMESPACE_END diff --git a/src/libaatm/include/ATMSkyStatus.h b/src/libaatm/include/ATMSkyStatus.h index 61e1095..b032836 100644 --- a/src/libaatm/include/ATMSkyStatus.h +++ b/src/libaatm/include/ATMSkyStatus.h @@ -198,12 +198,12 @@ class SkyStatus: public RefractiveIndexProfile and a perfect sky coupling */ Temperature getAverageTebbSky() { - unsigned int n = 0; + size_t n = 0; return getAverageTebbSky(n); } /** Accesor to the average Equivalent Blackbody Temperature in spectral window spwid, for the current conditions and a perfect sky coupling */ - Temperature getAverageTebbSky(unsigned int spwid) + Temperature getAverageTebbSky(size_t spwid) { return getAverageTebbSky(spwid, getUserWH2O(), @@ -216,7 +216,7 @@ class SkyStatus: public RefractiveIndexProfile Temperature getAverageTebbSky(const Length &wh2o) { return getAverageTebbSky(0, wh2o); } /** Accesor to the average Equivalent Blackbody Temperature in spectral window spwid, for the current conditions, except water column wh2o, and a perfect sky coupling */ - Temperature getAverageTebbSky(unsigned int spwid, const Length &wh2o) + Temperature getAverageTebbSky(size_t spwid, const Length &wh2o) { return getAverageTebbSky(spwid, wh2o, @@ -229,7 +229,7 @@ class SkyStatus: public RefractiveIndexProfile Temperature getAverageTebbSky(double airmass) { return getAverageTebbSky(0, airmass); } /** Accesor to the average Equivalent Blackbody Temperature in spectral window spwid, for the current conditions, except Air Mass airmass, and a perfect sky coupling */ - Temperature getAverageTebbSky(unsigned int spwid, double airmass) + Temperature getAverageTebbSky(size_t spwid, double airmass) { return getAverageTebbSky(spwid, getUserWH2O(), @@ -247,7 +247,7 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the average Equivalent Blackbody Temperature in spectral window spwid, for the current conditions, except water column wh2o, introducing a Sky Coupling and Spill Over Temperature */ - Temperature getAverageTebbSky(unsigned int spwid, + Temperature getAverageTebbSky(size_t spwid, const Length &wh2o, double skycoupling, const Temperature &Tspill) @@ -264,7 +264,7 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the average Equivalent Blackbody Temperature in spectral window spwid, for the current conditions, except Air Mass airmass, introducing a Sky Coupling and Spill Over Temperature */ - Temperature getAverageTebbSky(unsigned int spwid, + Temperature getAverageTebbSky(size_t spwid, double airmass, double skycoupling, const Temperature &Tspill) @@ -275,12 +275,12 @@ class SkyStatus: public RefractiveIndexProfile conditions, introducing a Sky Coupling and Spill Over Temperature */ Temperature getAverageTebbSky(double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getAverageTebbSky(n, skycoupling, Tspill); } /** Accesor to the average Equivalent Blackbody Temperature in spectral window spwid for the current conditions, introducing a Sky Coupling and Spill Over Temperature */ - Temperature getAverageTebbSky(unsigned int spwid, + Temperature getAverageTebbSky(size_t spwid, double skycoupling, const Temperature &Tspill) { @@ -292,13 +292,13 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the average Equivalent Blackbody Temperature in spectral window spwid, for Water Column wh2o, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getAverageTebbSky(unsigned int spwid, + Temperature getAverageTebbSky(size_t spwid, const Length &wh2o, double airmass, double skycoupling, const Temperature &Tspill); - Temperature getAverageTebbSky(unsigned int spwid, + Temperature getAverageTebbSky(size_t spwid, const Length &wh2o, double airmass, double skycoupling, @@ -309,23 +309,23 @@ class SkyStatus: public RefractiveIndexProfile (user) Water Vapor Column, the current Air Mass, and perfect Sky Coupling to the sky */ Temperature getTebbSky() { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n); } /** Accesor to the Equivalent Blackbody Temperature in spectral window 0 and channel nc, for the currnet (user) Water Vapor Column, the current Air Mass, and perfect Sky Coupling to the sky */ - Temperature getTebbSky(unsigned int nc) // There was reported a bug at Launchpad: + Temperature getTebbSky(size_t nc) // There was reported a bug at Launchpad: // that the result did not take into account // the actual column of water. But it is not true. // The column of water is taken into account as // seen in the next accessor, that is referred by this one. { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, nc); } /** Accesor to the Equivalent Blackbody Temperature in spectral window spwid and channel nc, for the currnet (user) Water Vapor Column, the current Air Mass, and perfect Sky Coupling to the sky */ - Temperature getTebbSky(unsigned int spwid, unsigned int nc) + Temperature getTebbSky(size_t spwid, size_t nc) { return getTebbSky(spwid, nc, @@ -338,19 +338,19 @@ class SkyStatus: public RefractiveIndexProfile (user) Water Vapor Column, Air Mass airmass, and perfect Sky Coupling to the sky */ Temperature getTebbSky(double airmass) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, airmass); } /** Accesor to the Equivalent Blackbody Temperature in spectral window 0 and channel nc, for the currnet (user) Water Vapor Column, Air Mass airmass, and perfect Sky Coupling to the sky */ - Temperature getTebbSky(unsigned int nc, double airmass) + Temperature getTebbSky(size_t nc, double airmass) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, nc, airmass); } /** Accesor to the Equivalent Blackbody Temperature in spectral window spwid and channel nc, for the currnet (user) Water Vapor Column, Air Mass airmass, and perfect Sky Coupling to the sky */ - Temperature getTebbSky(unsigned int spwid, unsigned int nc, double airmass) + Temperature getTebbSky(size_t spwid, size_t nc, double airmass) { return getTebbSky(spwid, nc, getUserWH2O(), airmass, 1.0, Temperature(100, "K")); @@ -359,35 +359,35 @@ class SkyStatus: public RefractiveIndexProfile Vapor Column wh2o, the current Air Mass, and perfect Sky Coupling to the sky */ Temperature getTebbSky(const Length &wh2o) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, wh2o); } /** Accesor to the Equivalent Blackbody Temperature in spectral window 0 and channel nc, for Water Vapor Column wh2o, the current Air Mass, and perfect Sky Coupling to the sky */ - Temperature getTebbSky(unsigned int nc, const Length &wh2o) + Temperature getTebbSky(size_t nc, const Length &wh2o) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, nc, wh2o); } /** Accesor to the Equivalent Blackbody Temperature in spectral window spwid and channel nc, for Water Vapor Column wh2o, the current Air Mass, and perfect Sky Coupling to the sky */ - Temperature getTebbSky(unsigned int spwid, unsigned int nc, const Length &wh2o) + Temperature getTebbSky(size_t spwid, size_t nc, const Length &wh2o) { return getTebbSky(spwid, nc, wh2o, getAirMass(), 1.0, Temperature(100, "K")); } /** Accesor to the Equivalent Blackbody Temperature in spectral window 0 and channel nc, for the current (user) Water Vapor Column and Air Mass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTebbSky(unsigned int nc, + Temperature getTebbSky(size_t nc, double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, nc, skycoupling, Tspill); } /** Accesor to the Equivalent Blackbody Temperature in spectral window spwid and channel nc, for the current (user) Water Vapor Column and Air Mass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTebbSky(unsigned int spwid, - unsigned int nc, + Temperature getTebbSky(size_t spwid, + size_t nc, double skycoupling, const Temperature &Tspill) { @@ -400,15 +400,15 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the Equivalent Blackbody Temperature in spectral window 0 and channel nc, for Water Vapor Column wh2o, Air Mass airmass, and perfect Sky Coupling to the sky */ - Temperature getTebbSky(unsigned int nc, const Length &wh2o, double airmass) + Temperature getTebbSky(size_t nc, const Length &wh2o, double airmass) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, nc, wh2o, airmass); } /** Accesor to the Equivalent Blackbody Temperature in spectral window spwid and channel nc, for Water Vapor Column wh2o, Air Mass airmass, and perfect Sky Coupling to the sky */ - Temperature getTebbSky(unsigned int spwid, - unsigned int nc, + Temperature getTebbSky(size_t spwid, + size_t nc, const Length &wh2o, double airmass) { @@ -416,18 +416,18 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the Equivalent Blackbody Temperature in spectral window 0 and channel nc, for Water Vapor Column wh2o, the current Air Mass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTebbSky(unsigned int nc, + Temperature getTebbSky(size_t nc, const Length &wh2o, double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, nc, wh2o, skycoupling, Tspill); } /** Accesor to the Equivalent Blackbody Temperature in spectral window spwid and channel nc, for Water Vapor Column wh2o, the current Air Mass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTebbSky(unsigned int spwid, - unsigned int nc, + Temperature getTebbSky(size_t spwid, + size_t nc, const Length &wh2o, double skycoupling, const Temperature &Tspill) @@ -436,18 +436,18 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the Equivalent Blackbody Temperature in spectral window 0 and channel nc, for the current User Water Column, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTebbSky(unsigned int nc, + Temperature getTebbSky(size_t nc, double airmass, double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, nc, airmass, skycoupling, Tspill); } /** Accesor to the Equivalent Blackbody Temperature in spectral window spwid and channel nc, for the current User Water Column, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTebbSky(unsigned int spwid, - unsigned int nc, + Temperature getTebbSky(size_t spwid, + size_t nc, double airmass, double skycoupling, const Temperature &Tspill) @@ -456,19 +456,19 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the Equivalent Blackbody Temperature in spectral window 0 and channel nc, for Water Column wh2o, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTebbSky(unsigned int nc, + Temperature getTebbSky(size_t nc, const Length &wh2o, double airmass, double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getTebbSky(n, nc, wh2o, airmass, skycoupling, Tspill); } /** Accesor to the Equivalent Blackbody Temperature in spectral window spwid and channel nc, for Water Column wh2o, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTebbSky(unsigned int spwid, - unsigned int nc, + Temperature getTebbSky(size_t spwid, + size_t nc, const Length &wh2o, double airmass, double skycoupling, @@ -479,12 +479,12 @@ class SkyStatus: public RefractiveIndexProfile and a perfect sky coupling */ Temperature getAverageTrjSky() { - unsigned int n = 0; + size_t n = 0; return getAverageTrjSky(n); } /** Accesor to the average Rayleigh-Jeans Temperature in spectral window spwid, for the current conditions and a perfect sky coupling */ - Temperature getAverageTrjSky(unsigned int spwid) + Temperature getAverageTrjSky(size_t spwid) { return getAverageTrjSky(spwid, getUserWH2O(), @@ -497,7 +497,7 @@ class SkyStatus: public RefractiveIndexProfile Temperature getAverageTrjSky(const Length &wh2o) { return getAverageTrjSky(0, wh2o); } /** Accesor to the average Rayleigh-Jeans Temperature in spectral window spwid, for the current conditions, except water column wh2o, and a perfect sky coupling */ - Temperature getAverageTrjSky(unsigned int spwid, const Length &wh2o) + Temperature getAverageTrjSky(size_t spwid, const Length &wh2o) { return getAverageTrjSky(spwid, wh2o, @@ -510,7 +510,7 @@ class SkyStatus: public RefractiveIndexProfile Temperature getAverageTrjSky(double airmass) { return getAverageTrjSky(0, airmass); } /** Accesor to the average Rayleigh-Jeans Temperature in spectral window spwid, for the current conditions, except Air Mass airmass, and a perfect sky coupling */ - Temperature getAverageTrjSky(unsigned int spwid, double airmass) + Temperature getAverageTrjSky(size_t spwid, double airmass) { return getAverageTrjSky(spwid, getUserWH2O(), @@ -528,7 +528,7 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the average Rayleigh-Jeans Temperature in spectral window spwid, for the current conditions, except water column wh2o, introducing a Sky Coupling and Spill Over Temperature */ - Temperature getAverageTrjSky(unsigned int spwid, + Temperature getAverageTrjSky(size_t spwid, const Length &wh2o, double skycoupling, const Temperature &Tspill) @@ -545,7 +545,7 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the average Rayleigh-Jeans Temperature in spectral window spwid, for the current conditions, except Air Mass airmass, introducing a Sky Coupling and Spill Over Temperature */ - Temperature getAverageTrjSky(unsigned int spwid, + Temperature getAverageTrjSky(size_t spwid, double airmass, double skycoupling, const Temperature &Tspill) @@ -556,12 +556,12 @@ class SkyStatus: public RefractiveIndexProfile conditions, introducing a Sky Coupling and Spill Over Temperature */ Temperature getAverageTrjSky(double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getAverageTrjSky(n, skycoupling, Tspill); } /** Accesor to the average Rayleigh-Jeans Temperature in spectral window spwid for the current conditions, introducing a Sky Coupling and Spill Over Temperature */ - Temperature getAverageTrjSky(unsigned int spwid, + Temperature getAverageTrjSky(size_t spwid, double skycoupling, const Temperature &Tspill) { @@ -573,13 +573,13 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the average Rayleigh-Jeans Temperature in spectral window spwid, for Water Column wh2o, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getAverageTrjSky(unsigned int spwid, + Temperature getAverageTrjSky(size_t spwid, const Length &wh2o, double airmass, double skycoupling, const Temperature &Tspill); - Temperature getAverageTrjSky(unsigned int spwid, + Temperature getAverageTrjSky(size_t spwid, const Length &wh2o, double airmass, double skycoupling, @@ -590,23 +590,23 @@ class SkyStatus: public RefractiveIndexProfile (user) Water Vapor Column, the current Air Mass, and perfect Sky Coupling to the sky */ Temperature getTrjSky() { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window 0 and channel nc, for the currnet (user) Water Vapor Column, the current Air Mass, and perfect Sky Coupling to the sky */ - Temperature getTrjSky(unsigned int nc) // There was reported a bug at Launchpad: + Temperature getTrjSky(size_t nc) // There was reported a bug at Launchpad: // that the result did not take into account // the actual column of water. But it is not true. // The column of water is taken into account as // seen in the next accessor, that is referred by this one. { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, nc); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window spwid and channel nc, for the currnet (user) Water Vapor Column, the current Air Mass, and perfect Sky Coupling to the sky */ - Temperature getTrjSky(unsigned int spwid, unsigned int nc) + Temperature getTrjSky(size_t spwid, size_t nc) { return getTrjSky(spwid, nc, @@ -619,19 +619,19 @@ class SkyStatus: public RefractiveIndexProfile (user) Water Vapor Column, Air Mass airmass, and perfect Sky Coupling to the sky */ Temperature getTrjSky(double airmass) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, airmass); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window 0 and channel nc, for the currnet (user) Water Vapor Column, Air Mass airmass, and perfect Sky Coupling to the sky */ - Temperature getTrjSky(unsigned int nc, double airmass) + Temperature getTrjSky(size_t nc, double airmass) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, nc, airmass); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window spwid and channel nc, for the currnet (user) Water Vapor Column, Air Mass airmass, and perfect Sky Coupling to the sky */ - Temperature getTrjSky(unsigned int spwid, unsigned int nc, double airmass) + Temperature getTrjSky(size_t spwid, size_t nc, double airmass) { return getTrjSky(spwid, nc, getUserWH2O(), airmass, 1.0, Temperature(100, "K")); @@ -640,35 +640,35 @@ class SkyStatus: public RefractiveIndexProfile Vapor Column wh2o, the current Air Mass, and perfect Sky Coupling to the sky */ Temperature getTrjSky(const Length &wh2o) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, wh2o); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window 0 and channel nc, for Water Vapor Column wh2o, the current Air Mass, and perfect Sky Coupling to the sky */ - Temperature getTrjSky(unsigned int nc, const Length &wh2o) + Temperature getTrjSky(size_t nc, const Length &wh2o) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, nc, wh2o); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window spwid and channel nc, for Water Vapor Column wh2o, the current Air Mass, and perfect Sky Coupling to the sky */ - Temperature getTrjSky(unsigned int spwid, unsigned int nc, const Length &wh2o) + Temperature getTrjSky(size_t spwid, size_t nc, const Length &wh2o) { return getTrjSky(spwid, nc, wh2o, getAirMass(), 1.0, Temperature(100, "K")); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window 0 and channel nc, for the current (user) Water Vapor Column and Air Mass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTrjSky(unsigned int nc, + Temperature getTrjSky(size_t nc, double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, nc, skycoupling, Tspill); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window spwid and channel nc, for the current (user) Water Vapor Column and Air Mass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTrjSky(unsigned int spwid, - unsigned int nc, + Temperature getTrjSky(size_t spwid, + size_t nc, double skycoupling, const Temperature &Tspill) { @@ -681,15 +681,15 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the Rayleigh-Jeans Temperature in spectral window 0 and channel nc, for Water Vapor Column wh2o, Air Mass airmass, and perfect Sky Coupling to the sky */ - Temperature getTrjSky(unsigned int nc, const Length &wh2o, double airmass) + Temperature getTrjSky(size_t nc, const Length &wh2o, double airmass) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, nc, wh2o, airmass); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window spwid and channel nc, for Water Vapor Column wh2o, Air Mass airmass, and perfect Sky Coupling to the sky */ - Temperature getTrjSky(unsigned int spwid, - unsigned int nc, + Temperature getTrjSky(size_t spwid, + size_t nc, const Length &wh2o, double airmass) { @@ -697,18 +697,18 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the Rayleigh-Jeans Temperature in spectral window 0 and channel nc, for Water Vapor Column wh2o, the current Air Mass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTrjSky(unsigned int nc, + Temperature getTrjSky(size_t nc, const Length &wh2o, double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, nc, wh2o, skycoupling, Tspill); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window spwid and channel nc, for Water Vapor Column wh2o, the current Air Mass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTrjSky(unsigned int spwid, - unsigned int nc, + Temperature getTrjSky(size_t spwid, + size_t nc, const Length &wh2o, double skycoupling, const Temperature &Tspill) @@ -717,18 +717,18 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the Rayleigh-Jeans Temperature in spectral window 0 and channel nc, for the current User Water Column, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTrjSky(unsigned int nc, + Temperature getTrjSky(size_t nc, double airmass, double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, nc, airmass, skycoupling, Tspill); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window spwid and channel nc, for the current User Water Column, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTrjSky(unsigned int spwid, - unsigned int nc, + Temperature getTrjSky(size_t spwid, + size_t nc, double airmass, double skycoupling, const Temperature &Tspill) @@ -737,48 +737,48 @@ class SkyStatus: public RefractiveIndexProfile } /** Accesor to the Rayleigh-Jeans Temperature in spectral window 0 and channel nc, for Water Column wh2o, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTrjSky(unsigned int nc, + Temperature getTrjSky(size_t nc, const Length &wh2o, double airmass, double skycoupling, const Temperature &Tspill) { - unsigned int n = 0; + size_t n = 0; return getTrjSky(n, nc, wh2o, airmass, skycoupling, Tspill); } /** Accesor to the Rayleigh-Jeans Temperature in spectral window spwid and channel nc, for Water Column wh2o, Air Mass airmass, Sky Coupling skycoupling, and Spill Over Temperature Tspill */ - Temperature getTrjSky(unsigned int spwid, - unsigned int nc, + Temperature getTrjSky(size_t spwid, + size_t nc, const Length &wh2o, double airmass, double skycoupling, const Temperature &Tspill); - + /** Accesor to get the integrated zenith Wet Opacity for the current conditions, for a single frequency RefractiveIndexProfile object or for the point 0 of spectral window 0 of a multi-window RefractiveIndexProfile object. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getWetOpacity(){unsigned int n = 0; return getWetOpacity(n);} - Opacity getWetOpacityUpTo(Length refalti){unsigned int n = 0; return getWetOpacityUpTo(n, refalti);} + Opacity getWetOpacity(){size_t n = 0; return getWetOpacity(n);} + Opacity getWetOpacityUpTo(Length refalti){size_t n = 0; return getWetOpacityUpTo(n, refalti);} /** Accesor to get the integrated zenith Wet Opacity for the current conditions, for the point nc of spectral window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getWetOpacity(unsigned int nc){return getH2OLinesOpacity(nc) + getH2OContOpacity(nc);} - Opacity getWetOpacityUpTo(unsigned int nc, Length refalti){return getH2OLinesOpacityUpTo(nc, refalti) + getH2OContOpacityUpTo(nc, refalti);} + Opacity getWetOpacity(size_t nc){return getH2OLinesOpacity(nc) + getH2OContOpacity(nc);} + Opacity getWetOpacityUpTo(size_t nc, Length refalti){return getH2OLinesOpacityUpTo(nc, refalti) + getH2OContOpacityUpTo(nc, refalti);} /** Accesor to get the integrated zenith Wet Opacity for the current conditions, for the point nc of spectral window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getWetOpacity(unsigned int spwid, unsigned int nc) + Opacity getWetOpacity(size_t spwid, size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getWetOpacity(v_transfertId_[spwid] + nc); } - Opacity getWetOpacityUpTo(unsigned int spwid, unsigned int nc, Length refalti) + Opacity getWetOpacityUpTo(size_t spwid, size_t nc, Length refalti) { if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getWetOpacityUpTo(v_transfertId_[spwid] + nc, refalti); @@ -787,17 +787,17 @@ class SkyStatus: public RefractiveIndexProfile in spectral window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getAverageWetOpacity(unsigned int spwid) + Opacity getAverageWetOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageWetOpacity(getGroundWH2O(),spwid) * ((getUserWH2O().get()) / (getGroundWH2O().get())); } - Opacity getAverageH2OLinesOpacity(unsigned int spwid) + Opacity getAverageH2OLinesOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageH2OLinesOpacity(getGroundWH2O(),spwid) * ((getUserWH2O().get()) / (getGroundWH2O().get())); } - Opacity getAverageH2OContOpacity(unsigned int spwid) + Opacity getAverageH2OContOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageH2OContOpacity(getGroundWH2O(),spwid) * ((getUserWH2O().get()) / (getGroundWH2O().get())); @@ -807,44 +807,44 @@ class SkyStatus: public RefractiveIndexProfile { return RefractiveIndexProfile::getDryOpacity(); } - Opacity getDryOpacity(unsigned int nc) + Opacity getDryOpacity(size_t nc) { return RefractiveIndexProfile::getDryOpacity(nc); } - Opacity getDryOpacity(unsigned int spwid, unsigned int nc) + Opacity getDryOpacity(size_t spwid, size_t nc) { return RefractiveIndexProfile::getDryOpacity(spwid, nc); } - Opacity getAverageDryOpacity(unsigned int spwid) + Opacity getAverageDryOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageDryOpacity(spwid); } - Opacity getAverageO2LinesOpacity(unsigned int spwid) + Opacity getAverageO2LinesOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageO2LinesOpacity(spwid); } - Opacity getAverageO3LinesOpacity(unsigned int spwid) + Opacity getAverageO3LinesOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageO3LinesOpacity(spwid); } - Opacity getAverageN2OLinesOpacity(unsigned int spwid) + Opacity getAverageN2OLinesOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageN2OLinesOpacity(spwid); } - Opacity getAverageNO2LinesOpacity(unsigned int spwid) + Opacity getAverageNO2LinesOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageNO2LinesOpacity(spwid); } - Opacity getAverageSO2LinesOpacity(unsigned int spwid) + Opacity getAverageSO2LinesOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageSO2LinesOpacity(spwid); } - Opacity getAverageCOLinesOpacity(unsigned int spwid) + Opacity getAverageCOLinesOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageCOLinesOpacity(spwid); } - Opacity getAverageDryContOpacity(unsigned int spwid) + Opacity getAverageDryContOpacity(size_t spwid) { return RefractiveIndexProfile::getAverageDryContOpacity(spwid); } @@ -853,29 +853,29 @@ class SkyStatus: public RefractiveIndexProfile { return getWetOpacity() + getDryOpacity(); } - Opacity getTotalOpacity(unsigned int nc) + Opacity getTotalOpacity(size_t nc) { return getWetOpacity(nc) + getDryOpacity(nc); } - Opacity getTotalOpacity(unsigned int spwid, unsigned int nc) + Opacity getTotalOpacity(size_t spwid, size_t nc) { return getWetOpacity(spwid, nc) + getDryOpacity(spwid, nc); } - Opacity getAverageTotalOpacity(unsigned int spwid) + Opacity getAverageTotalOpacity(size_t spwid) { return getAverageWetOpacity(spwid) + getAverageDryOpacity(spwid); } Opacity getTotalOpacityUpTo(Length refalti) { - unsigned int n = 0; + size_t n = 0; return getTotalOpacityUpTo(n, refalti); } - // Opacity getTotalOpacityUpTo(unsigned int nc, Length refalti); - Opacity getTotalOpacityUpTo(unsigned int nc, Length refalti) + // Opacity getTotalOpacityUpTo(size_t nc, Length refalti); + Opacity getTotalOpacityUpTo(size_t nc, Length refalti) { return getWetOpacityUpTo(nc,refalti) + getDryOpacityUpTo(nc,refalti); } - Opacity getTotalOpacityUpTo(unsigned int spwid, unsigned int nc, Length refalti) + Opacity getTotalOpacityUpTo(size_t spwid, size_t nc, Length refalti) { Opacity wrongOp(-999.0,"np"); if(!spwidAndIndexAreValid(spwid, nc)) return wrongOp; @@ -886,39 +886,39 @@ class SkyStatus: public RefractiveIndexProfile window 0 of a multi-window RefractiveIndexProfile object. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getH2OLinesOpacity(){ unsigned int n = 0; return getH2OLinesOpacity(n);} - Opacity getH2OLinesOpacityUpTo(Length refalti){ unsigned int n = 0; return getH2OLinesOpacityUpTo(n, refalti);} + Opacity getH2OLinesOpacity(){ size_t n = 0; return getH2OLinesOpacity(n);} + Opacity getH2OLinesOpacityUpTo(Length refalti){ size_t n = 0; return getH2OLinesOpacityUpTo(n, refalti);} /** Accesor to get the integrated zenith H2O Lines Opacity for the current conditions, for the point nc of spectral window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getH2OLinesOpacity(unsigned int nc); - Opacity getH2OLinesOpacityUpTo(unsigned int nc, Length refalti); + Opacity getH2OLinesOpacity(size_t nc); + Opacity getH2OLinesOpacityUpTo(size_t nc, Length refalti); /** Accesor to get the integrated zenith H2O Lines Opacity for the current conditions, for the point nc of spectral window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getH2OLinesOpacity(unsigned int spwid, unsigned int nc){ if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getH2OLinesOpacity(v_transfertId_[spwid] + nc);} - Opacity getH2OLinesOpacityUpTo(unsigned int spwid, unsigned int nc, Length refalti){ if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getH2OLinesOpacityUpTo(v_transfertId_[spwid] + nc, refalti);} + Opacity getH2OLinesOpacity(size_t spwid, size_t nc){ if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getH2OLinesOpacity(v_transfertId_[spwid] + nc);} + Opacity getH2OLinesOpacityUpTo(size_t spwid, size_t nc, Length refalti){ if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getH2OLinesOpacityUpTo(v_transfertId_[spwid] + nc, refalti);} /** Accesor to get the integrated zenith H2O Continuum Opacity for the current conditions, for a single frequency RefractiveIndexProfile object or for the point 0 of spectral window 0 of a multi-window RefractiveIndexProfile object. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getH2OContOpacity(){unsigned int n = 0; return getH2OContOpacity(n);} - Opacity getH2OContOpacityUpTo(Length refalti){unsigned int n = 0; return getH2OContOpacityUpTo(n, refalti);} + Opacity getH2OContOpacity(){size_t n = 0; return getH2OContOpacity(n);} + Opacity getH2OContOpacityUpTo(Length refalti){size_t n = 0; return getH2OContOpacityUpTo(n, refalti);} /** Accesor to get the integrated zenith H2O Continuum Opacity for the current conditions, for the point nc of spectral window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getH2OContOpacity(unsigned int nc); - Opacity getH2OContOpacityUpTo(unsigned int nc, Length refalti); + Opacity getH2OContOpacity(size_t nc); + Opacity getH2OContOpacityUpTo(size_t nc, Length refalti); /** Accesor to get the integrated zenith H2O Continuum Opacity for the current conditions, for the point nc of spectral window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Opacity getH2OContOpacity(unsigned int spwid, unsigned int nc){ if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getH2OContOpacity(v_transfertId_[spwid] + nc);} - Opacity getH2OContOpacityUpTo(unsigned int spwid, unsigned int nc, Length refalti){ if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getH2OContOpacityUpTo(v_transfertId_[spwid] + nc, refalti);} + Opacity getH2OContOpacity(size_t spwid, size_t nc){ if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getH2OContOpacity(v_transfertId_[spwid] + nc);} + Opacity getH2OContOpacityUpTo(size_t spwid, size_t nc, Length refalti){ if(!spwidAndIndexAreValid(spwid, nc)) return (double) -999.0; return getH2OContOpacityUpTo(v_transfertId_[spwid] + nc, refalti);} /** Accesor to get the integrated zenith H2O Atmospheric Phase Delay (Dispersive part) for the current conditions, for a single frequency RefractiveIndexProfile object or for the point 0 of spectral window 0 of a multi-window RefractiveIndexProfile object. @@ -926,7 +926,7 @@ class SkyStatus: public RefractiveIndexProfile case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ Angle getDispersiveH2OPhaseDelay() { - unsigned int n = 0; + size_t n = 0; return getDispersiveH2OPhaseDelay(n); } /** Accesor to get the integrated zenith H2O Atmospheric Phase Delay (Dispersive part) @@ -934,13 +934,13 @@ class SkyStatus: public RefractiveIndexProfile for the point nc of spectral window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Angle getDispersiveH2OPhaseDelay(unsigned int nc); + Angle getDispersiveH2OPhaseDelay(size_t nc); /** Accesor to get the integrated zenith H2O Atmospheric Phase Delay (Dispersive part) for the current conditions, for a single frequency RefractiveIndexProfile object or for the point nc of spectral window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Angle getDispersiveH2OPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getDispersiveH2OPhaseDelay(size_t spwid, size_t nc); /** Accesor to get the integrated zenith H2O Atmospheric Path length (Dispersive part) for the current conditions, for a single frequency RefractiveIndexProfile object or @@ -949,7 +949,7 @@ class SkyStatus: public RefractiveIndexProfile case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ Length getDispersiveH2OPathLength() { - unsigned int n = 0; + size_t n = 0; return getDispersiveH2OPathLength(n); } /** Accesor to get the integrated zenith H2O Atmospheric Path length (Dispersive part) @@ -957,13 +957,13 @@ class SkyStatus: public RefractiveIndexProfile for the point nc of spectral window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Length getDispersiveH2OPathLength(unsigned int nc); + Length getDispersiveH2OPathLength(size_t nc); /** Accesor to get the integrated zenith H2O Atmospheric Path length (Dispersive part) for the current conditions, for a single frequency RefractiveIndexProfile object or for the point nc of spectral window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Length getDispersiveH2OPathLength(unsigned int spwid, unsigned int nc); + Length getDispersiveH2OPathLength(size_t spwid, size_t nc); /** Accesor to get the integrated zenith H2O Atmospheric Phase Delay (Non-Dispersive part) for the current conditions, for a single frequency RefractiveIndexProfile object or @@ -972,7 +972,7 @@ class SkyStatus: public RefractiveIndexProfile case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ Angle getNonDispersiveH2OPhaseDelay() { - unsigned int n = 0; + size_t n = 0; return getNonDispersiveH2OPhaseDelay(n); } /** Accesor to get the integrated zenith H2O Atmospheric Phase Delay (Non-Dispersive part) @@ -980,13 +980,13 @@ class SkyStatus: public RefractiveIndexProfile for the point nc of spectral window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Angle getNonDispersiveH2OPhaseDelay(unsigned int nc); + Angle getNonDispersiveH2OPhaseDelay(size_t nc); /** Accesor to get the integrated zenith H2O Atmospheric Phase Delay (Non-Dispersive part) for the current conditions, for a single frequency RefractiveIndexProfile object or for the point nc of spectral window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Angle getNonDispersiveH2OPhaseDelay(unsigned int spwid, unsigned int nc); + Angle getNonDispersiveH2OPhaseDelay(size_t spwid, size_t nc); /** Accesor to get the integrated zenith H2O Atmospheric Path length (Non-Dispersive part) for the current conditions, for a single frequency RefractiveIndexProfile object or @@ -995,7 +995,7 @@ class SkyStatus: public RefractiveIndexProfile case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ Length getNonDispersiveH2OPathLength() { - unsigned int n = 0; + size_t n = 0; return getNonDispersiveH2OPathLength(n); } /** Accesor to get the integrated zenith H2O Atmospheric Path length (Non-Dispersive part) @@ -1003,40 +1003,40 @@ class SkyStatus: public RefractiveIndexProfile for the point nc of spectral window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Length getNonDispersiveH2OPathLength(unsigned int nc); + Length getNonDispersiveH2OPathLength(size_t nc); /** Accesor to get the integrated zenith H2O Atmospheric Path length (Non-Dispersive part) for the current conditions, for a single frequency RefractiveIndexProfile object or for the point nc of spectral window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Length getNonDispersiveH2OPathLength(unsigned int spwid, unsigned int nc); + Length getNonDispersiveH2OPathLength(size_t spwid, size_t nc); /** Accessor to get the average integrated zenith Atmospheric Phase Delay (Dispersive part) for the current conditions in spectral Window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Angle getAverageDispersiveH2OPhaseDelay(unsigned int spwid); + Angle getAverageDispersiveH2OPhaseDelay(size_t spwid); /** Accessor to get the average integrated zenith Atmospheric Phase Delay (Dispersive part) for the current conditions in spectral Window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ Angle getAverageDispersiveH2OPhaseDelay() { - unsigned int n = 0; + size_t n = 0; return getAverageDispersiveH2OPhaseDelay(n); } /** Accessor to get the average integrated zenith Atmospheric Phase Delay (Non-Dispersive part) in spectral Window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Angle getAverageNonDispersiveH2OPhaseDelay(unsigned int spwid); + Angle getAverageNonDispersiveH2OPhaseDelay(size_t spwid); /** Accessor to get the average integrated zenith Atmospheric Phase Delay (Non-Dispersive part) in spectral Window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ Angle getAverageNonDispersiveH2OPhaseDelay() { - unsigned int n = 0; + size_t n = 0; return getAverageNonDispersiveH2OPhaseDelay(n); } @@ -1044,65 +1044,65 @@ class SkyStatus: public RefractiveIndexProfile in spectral Window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Length getAverageDispersiveH2OPathLength(unsigned int spwid); + Length getAverageDispersiveH2OPathLength(size_t spwid); /** Accessor to get the average integrated zenith Atmospheric Path Length (Dispersive part) in spectral Window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ Length getAverageDispersiveH2OPathLength() { - unsigned int n = 0; + size_t n = 0; return getAverageDispersiveH2OPathLength(n); } /** Accessor to get the average integrated zenith Atmospheric Path Length (Non-Dispersive part) in spectral Window spwid. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ - Length getAverageNonDispersiveH2OPathLength(unsigned int spwid); + Length getAverageNonDispersiveH2OPathLength(size_t spwid); /** Accessor to get the average integrated zenith Atmospheric Path Length (Non-Dispersive part) in spectral Window 0. There is overloading. The same accessor exists in RefractiveIndexProfile but in that case the returned value corresponds to the zenith water vapor column of the AtmProfile object.*/ Length getAverageNonDispersiveH2OPathLength() { - unsigned int n = 0; + size_t n = 0; return getAverageNonDispersiveH2OPathLength(n); } - Length getAverageH2OPathLength(unsigned int spwid) + Length getAverageH2OPathLength(size_t spwid) { return getAverageDispersiveH2OPathLength(spwid) + getAverageNonDispersiveH2OPathLength(spwid); } Length getAverageH2OPathLength() { - unsigned int n = 0; + size_t n = 0; return getAverageH2OPathLength(n); } - double getAverageH2OPathLengthDerivative(unsigned int spwid) + double getAverageH2OPathLengthDerivative(size_t spwid) { return getAverageH2OPathLength(spwid).get("microns") / getUserWH2O().get("microns"); } // in microns/micron_H2O double getAverageH2OPathLengthDerivative() { - unsigned int n = 0; + size_t n = 0; return getAverageH2OPathLengthDerivative(n); } // in microns/micron_H2O - Angle getAverageH2OPhaseDelay(unsigned int spwid) + Angle getAverageH2OPhaseDelay(size_t spwid) { return getAverageDispersiveH2OPhaseDelay(spwid) + getAverageNonDispersiveH2OPhaseDelay(spwid); } Angle getAverageH2OPhaseDelay() { - unsigned int n = 0; + size_t n = 0; return getAverageH2OPhaseDelay(n); } - Length getAverageDispersiveDryPathLength(unsigned int spwid) + Length getAverageDispersiveDryPathLength(size_t spwid) { return getAverageO2LinesPathLength(spwid) + getAverageO3LinesPathLength(spwid) @@ -1113,35 +1113,35 @@ class SkyStatus: public RefractiveIndexProfile } Length getAverageDispersiveDryPathLength() { - unsigned int n = 0; + size_t n = 0; return getAverageDispersiveDryPathLength(n); } - Length getAverageNonDispersiveDryPathLength(unsigned int spwid) + Length getAverageNonDispersiveDryPathLength(size_t spwid) { return RefractiveIndexProfile::getAverageNonDispersiveDryPathLength(spwid); } Length getAverageNonDispersiveDryPathLength() { - unsigned int n = 0; + size_t n = 0; return getAverageNonDispersiveDryPathLength(n); } double - getAverageNonDispersiveDryPathLength_GroundPressureDerivative(unsigned int spwid); + getAverageNonDispersiveDryPathLength_GroundPressureDerivative(size_t spwid); double - getAverageNonDispersiveDryPathLength_GroundTemperatureDerivative(unsigned int spwid); + getAverageNonDispersiveDryPathLength_GroundTemperatureDerivative(size_t spwid); double - getAverageDispersiveDryPathLength_GroundPressureDerivative(unsigned int spwid); + getAverageDispersiveDryPathLength_GroundPressureDerivative(size_t spwid); double - getAverageDispersiveDryPathLength_GroundTemperatureDerivative(unsigned int spwid); + getAverageDispersiveDryPathLength_GroundTemperatureDerivative(size_t spwid); - Length getAverageO2LinesPathLength(unsigned int spwid) + Length getAverageO2LinesPathLength(size_t spwid) { return RefractiveIndexProfile::getAverageO2LinesPathLength(spwid); } Length getAverageO2LinesPathLength() { - unsigned int n = 0; + size_t n = 0; return getAverageO2LinesPathLength(n); } @@ -1245,23 +1245,23 @@ class SkyStatus: public RefractiveIndexProfile const Length &wvScaleHeight); /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - void addNewSpectralWindow(unsigned int numChan, - unsigned int refChan, + void addNewSpectralWindow(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep) { RefractiveIndexProfile::add(numChan, refChan, refFreq, chanSep); } /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - void addNewSpectralWindow(unsigned int numChan, - unsigned int refChan, + void addNewSpectralWindow(size_t numChan, + size_t refChan, double* chanFreq, const string &freqUnits) { RefractiveIndexProfile::add(numChan, refChan, chanFreq, freqUnits); } /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - void addNewSpectralWindow(unsigned int numChan, + void addNewSpectralWindow(size_t numChan, double refFreq, double* chanFreq, const string &freqUnits) @@ -1269,7 +1269,7 @@ class SkyStatus: public RefractiveIndexProfile RefractiveIndexProfile::add(numChan, refFreq, chanFreq, freqUnits); } /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - void addNewSpectralWindow(unsigned int numChan, + void addNewSpectralWindow(size_t numChan, double refFreq, const vector &chanFreq, const string &freqUnits) @@ -1277,8 +1277,8 @@ class SkyStatus: public RefractiveIndexProfile RefractiveIndexProfile::add(numChan, refFreq, chanFreq, freqUnits); } /** Setter of new spectral windows (adds frequencies to the SpectralGrid and calculates the corresponding absorption coefficients) */ - void addNewSpectralWindow(unsigned int numChan, - unsigned int refChan, + void addNewSpectralWindow(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep, const Frequency &intermediateFreq, @@ -1305,7 +1305,7 @@ class SkyStatus: public RefractiveIndexProfile changed using the setAirMass setter. */ Length WaterVaporRetrieval_fromFTS(const vector &v_transmission) { - unsigned int spwId = 0; + size_t spwId = 0; Frequency f1(-999, "GHz"); Frequency f2(-999, "GHz"); return WaterVaporRetrieval_fromFTS(spwId, v_transmission, f1, f2); @@ -1315,7 +1315,7 @@ class SkyStatus: public RefractiveIndexProfile const Frequency &f1, const Frequency &f2) { - unsigned int spwId = 0; + size_t spwId = 0; return WaterVaporRetrieval_fromFTS(spwId, v_transmission, f1, f2); } /** Zenith Water Vapor column retrieval based on fitting the vector of zenith atmospheric transmission given as input. @@ -1323,7 +1323,7 @@ class SkyStatus: public RefractiveIndexProfile transmission vector should match those frequencies (i.e. both vectors should have the same size), C) the air mass for the retrieval is the current one. If a different one is desired, it should be changed using the setAirMass setter. */ - Length WaterVaporRetrieval_fromFTS(unsigned int spwId, + Length WaterVaporRetrieval_fromFTS(size_t spwId, const vector &v_transmission) { Frequency f1(-999, "GHz"); @@ -1331,13 +1331,13 @@ class SkyStatus: public RefractiveIndexProfile return WaterVaporRetrieval_fromFTS(spwId, v_transmission, f1, f2); } /** Same as above but using for the retrieval only the measurements between frequencies f1 and f2>f1 */ - Length WaterVaporRetrieval_fromFTS(unsigned int spwId, + Length WaterVaporRetrieval_fromFTS(size_t spwId, const vector &v_transmission, const Frequency &f1, const Frequency &f2); /** Zenith Water Vapor column retrieval based on fitting measured brightness temperatures of the atmosphere */ - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &vv_tebb, const vector > &spwId_filters, @@ -1345,7 +1345,7 @@ class SkyStatus: public RefractiveIndexProfile const vector &skycoupling, const vector &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &v_tebb, const vector > &spwId_filters, @@ -1354,7 +1354,7 @@ class SkyStatus: public RefractiveIndexProfile const vector &tspill); /* to implement in .cpp - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, Percent signalGain, Temperature tebb, vector spwId_filter, @@ -1363,7 +1363,7 @@ class SkyStatus: public RefractiveIndexProfile Temperature tspill); */ - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_tebb, const vector &spwId_filter, @@ -1371,7 +1371,7 @@ class SkyStatus: public RefractiveIndexProfile double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const Percent &signalGain, const vector &v_tebb, const vector > &spwId_filters, @@ -1379,99 +1379,99 @@ class SkyStatus: public RefractiveIndexProfile double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const Percent &signalGain, const vector &v_tebb, double airmass, double skycoupling, const Temperature &tspill); // equivalent eliminating the vectors already implemented, see below - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector > &vv_tebb, const vector &skycoupling, const vector &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &v_tebb, const vector &skycoupling, const vector &tspill); /* to be implemented in the .cpp - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, Temperature tebb, double skycoupling, Temperature tspill); */ - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, const vector &spwId_filter, double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector > &vv_tebb, const vector > &spwId_filters, const vector &skycoupling, const vector &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &v_tebb, const vector > &spwId_filters, const vector &skycoupling, const vector &tspill); /* to be implemented in the .cpp - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, Temperature tebb, vector spwId_filters, double skycoupling, Temperature tspill); */ - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, double airmass, double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector > &vv_tebb, double airmass, const vector &skycoupling, const vector &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &v_tebb, - double airmass, + double airmass, const vector &skycoupling, const vector &tspill); /* to be implemented in the .cpp - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Temperature &tebb, - double airmass, - double skycoupling, + double airmass, + double skycoupling, const Temperature &tspill); */ - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, const vector &spwId_filter, double airmass, double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector > &vv_tebb, const vector > &spwId_filters, double airmass, const vector &skycoupling, const vector &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &v_tebb, const vector > &spwId_filters, double airmass, @@ -1479,53 +1479,53 @@ class SkyStatus: public RefractiveIndexProfile const vector &tspill); /* to be implemented in the .cpp - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Temperature &v_tebb, const vector &spwId_filter, double airmass, double skycoupling, const Temperature &tspill); */ - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_tebb, double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &vv_tebb, const vector &skycoupling, const vector &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &v_tebb, const vector &skycoupling, const vector &tspill); /* to be implemented in the .cpp - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, constr Temperature &v_tebb, double skycoupling, const Temperature &tspill); */ - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_tebb, const vector &spwId_filter, double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &vv_tebb, const vector > &spwId_filters, const vector &skycoupling, const vector &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &v_tebb, const vector > &spwId_filters, @@ -1533,60 +1533,60 @@ class SkyStatus: public RefractiveIndexProfile const vector &tspill); /* to be implemented in the .cpp - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const Temperature &v_tebb, const vector &spwId_filter, double skycoupling, const Temperature &tspill); */ - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_tebb, double airmass, double skycoupling, const Temperature &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &vv_tebb, double airmass, const vector &skycoupling, const vector &tspill); - Length WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &v_tebb, - double airmass, + double airmass, const vector &skycoupling, const vector &tspill); // implemented 17/9/09 - Length WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const Temperature &tebb, double airmass, double skycoupling, const Temperature &tspill); - double SkyCouplingRetrieval_fromTEBB(unsigned int spwId, + double SkyCouplingRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, double skycoupling, const Temperature &tspill); - double SkyCouplingRetrieval_fromTEBB(unsigned int spwId, + double SkyCouplingRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, const vector &spwId_filter, double skycoupling, const Temperature &tspill); - double SkyCouplingRetrieval_fromTEBB(unsigned int spwId, + double SkyCouplingRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, double airmass, double skycoupling, const Temperature &tspill); - double SkyCouplingRetrieval_fromTEBB(unsigned int spwId, + double SkyCouplingRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, const vector &spwId_filter, double airmass, @@ -1603,31 +1603,31 @@ class SkyStatus: public RefractiveIndexProfile results from WVR measurement sets between n and m, keeping the other parameters unchanged) and uses the result to update the Skycoupling of all WVR channels */ void updateSkyCoupling_fromWVR(vector &RadiometerData, - unsigned int n, - unsigned int m); + size_t n, + size_t m); /** Performs a sky coupling retrieval using WVR measurement sets between n and m (obtains the ratio between the current sky coupling of a single WVR channel (ichan) and the best fit that results from WVR measurement sets between n and m, keeping the other parameters unchanged) and uses the result to update the Skycoupling of than WVR channel */ void updateSkyCouplingChannel_fromWVR(vector &RadiometerData, - unsigned int ichan, - unsigned int n, - unsigned int m); + size_t ichan, + size_t n, + size_t m); void updateSkyCoupling_fromWVR(vector &RadiometerData, - unsigned int n) + size_t n) { updateSkyCoupling_fromWVR(RadiometerData, n, n + 1); } void updateSkyCoupling_fromWVR(vector &RadiometerData, - unsigned int n, - unsigned int m, + size_t n, + size_t m, WaterVaporRadiometer &external_wvr) { updateSkyCoupling_fromWVR(RadiometerData, n, m); external_wvr = waterVaporRadiometer_; } void updateSkyCoupling_fromWVR(vector &RadiometerData, - unsigned int n, + size_t n, WaterVaporRadiometer &external_wvr) { updateSkyCoupling_fromWVR(RadiometerData, n, n + 1); @@ -1645,10 +1645,10 @@ class SkyStatus: public RefractiveIndexProfile } /** Performs water vapor retrieval for WVR measurement sets between n and m */ void WaterVaporRetrieval_fromWVR(vector &RadiometerData, - unsigned int n, - unsigned int m); + size_t n, + size_t m); void WaterVaporRetrieval_fromWVR(vector &RadiometerData, - unsigned int n) + size_t n) { WaterVaporRetrieval_fromWVR(RadiometerData, n, n + 1); } @@ -1664,59 +1664,59 @@ class SkyStatus: public RefractiveIndexProfile sigmaSkyCouplingRetrieval_fromWVR(double par_fit, const WaterVaporRadiometer &wvr, vector &RadiometerData, - unsigned int n, - unsigned int m); + size_t n, + size_t m); double sigmaSkyCouplingRetrieval_fromWVR(double par_fit, const WaterVaporRadiometer &wvr, vector &RadiometerData, - unsigned int n) + size_t n) { return sigmaSkyCouplingRetrieval_fromWVR(par_fit, wvr, RadiometerData, n, n + 1); } /* - return the rms of the residuals for one channel ichan, as a function of the multiplicative + return the rms of the residuals for one channel ichan, as a function of the multiplicative factor par_fit to this channel's coupling efficiency. */ double sigmaSkyCouplingChannelRetrieval_fromWVR(double par_fit, const WaterVaporRadiometer &wvr, vector &RadiometerData, - unsigned int ichan, - unsigned int n, - unsigned int m); + size_t ichan, + size_t n, + size_t m); Temperature getWVRAverageSigmaTskyFit(const vector &RadiometerData, - unsigned int n, - unsigned int m); + size_t n, + size_t m); Temperature getWVRAverageSigmaTskyFit(const vector &RadiometerData, - unsigned int n) + size_t n) { return getWVRAverageSigmaTskyFit(RadiometerData, n, n + 1); } - /* + /* return the rms of fit residual for a single channel, in a measurement */ Temperature getWVRSigmaChannelTskyFit(const vector &RadiometerData, - unsigned int ichan, - unsigned int n, - unsigned int m); + size_t ichan, + size_t n, + size_t m); /* - return the rms of water vapor retrieved values in a measurnment (n to m) + return the rms of water vapor retrieved values in a measurnment (n to m) */ - double getSigmaTransmissionFit(unsigned int spwId, + double getSigmaTransmissionFit(size_t spwId, const vector &v_transmission, double airm, const Frequency &f1, const Frequency &f2); //double getSigmaTransmissionFit(){} - Temperature getSigmaFit(unsigned int spwId, + Temperature getSigmaFit(size_t spwId, const vector &v_tebbspec, double skyCoupling, const Temperature &Tspill) { return getSigmaFit(spwId, v_tebbspec, getUserWH2O(), skyCoupling, Tspill); } - Temperature getSigmaFit(unsigned int spwId, + Temperature getSigmaFit(size_t spwId, const vector &v_tebbspec, const Length &wh2o, double skyCoupling, @@ -1729,7 +1729,7 @@ class SkyStatus: public RefractiveIndexProfile skyCoupling, Tspill); } - Temperature getSigmaFit(unsigned int spwId, + Temperature getSigmaFit(size_t spwId, const vector &v_tebbspec, double airmass, double skyCoupling, @@ -1742,7 +1742,7 @@ class SkyStatus: public RefractiveIndexProfile skyCoupling, Tspill); } - Temperature getSigmaFit(unsigned int spwId, + Temperature getSigmaFit(size_t spwId, const vector &v_tebbspec, const Length &wh2o, double airmass, @@ -1769,13 +1769,13 @@ class SkyStatus: public RefractiveIndexProfile const Length &wvScaleHeight); void rmSkyStatus(); //!< Resets retrieved water column to zero, or the default value. - Length mkWaterVaporRetrieval_fromFTS(unsigned int spwId, + Length mkWaterVaporRetrieval_fromFTS(size_t spwId, const vector &v_transmission, //double airm, // unused parameter const Frequency &f1, const Frequency &f2); - Length mkWaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length mkWaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_measuredSkyTEBB, double airm, @@ -1784,7 +1784,7 @@ class SkyStatus: public RefractiveIndexProfile const Temperature &tspill) { return mkWaterVaporRetrieval_fromTEBB( - vector(1, spwId), + vector(1, spwId), vector(1, signalGain), vector >(1, v_measuredSkyTEBB), airm, @@ -1794,7 +1794,7 @@ class SkyStatus: public RefractiveIndexProfile } Length - mkWaterVaporRetrieval_fromTEBB(const vector &spwId, + mkWaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &measuredSkyTEBB, double airm, @@ -1803,7 +1803,7 @@ class SkyStatus: public RefractiveIndexProfile const vector &tspill); Length - mkWaterVaporRetrieval_fromTEBB(const vector &spwId, + mkWaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &measuredAverageSkyTEBB, double airm, @@ -1811,7 +1811,7 @@ class SkyStatus: public RefractiveIndexProfile const vector &skycoupling, const vector &tspill); - double mkSkyCouplingRetrieval_fromTEBB(unsigned int spwId, + double mkSkyCouplingRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &measuredSkyTEBB, double airm, @@ -1821,7 +1821,7 @@ class SkyStatus: public RefractiveIndexProfile WVRMeasurement mkWaterVaporRetrieval_fromWVR(const vector &measuredSkyBrightnessVector, - const vector &radiometricChannels, + const vector &radiometricChannels, const vector &skyCoupling, const vector &signalGain, const Temperature &spilloverTemperature, @@ -1830,15 +1830,15 @@ class SkyStatus: public RefractiveIndexProfile double RT(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { return RT(pfit_wh2o, skycoupling, tspill, airMass_, spwid, nc); } double RT(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid) + size_t spwid) { return RT(pfit_wh2o, skycoupling, tspill, airMass_, spwid); } @@ -1846,17 +1846,17 @@ class SkyStatus: public RefractiveIndexProfile double skycoupling, double tspill, double airmass, - unsigned int spwId, - unsigned int nc); + size_t spwId, + size_t nc); double RT(double pfit_wh2o, double skycoupling, double tspill, double airmass, - unsigned int spwid) + size_t spwid) { double tebb_channel = 0.0; - for(unsigned int n = 0; n < v_numChan_[spwid]; n++) { + for(size_t n = 0; n < v_numChan_[spwid]; n++) { tebb_channel = tebb_channel + RT(pfit_wh2o, skycoupling, tspill, @@ -1870,11 +1870,11 @@ class SkyStatus: public RefractiveIndexProfile double RT(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid, + size_t spwid, const Percent &signalgain) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwid]; n++) { + for(size_t n = 0; n < v_numChan_[spwid]; n++) { spwId_filter.push_back(1.0); } return RT(pfit_wh2o, @@ -1890,11 +1890,11 @@ class SkyStatus: public RefractiveIndexProfile double skycoupling, double tspill, double airmass, - unsigned int spwid, + size_t spwid, const Percent &signalgain) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwid]; n++) { + for(size_t n = 0; n < v_numChan_[spwid]; n++) { spwId_filter.push_back(1.0); } return RT(pfit_wh2o, @@ -1909,7 +1909,7 @@ class SkyStatus: public RefractiveIndexProfile double RT(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid, + size_t spwid, const vector &spwId_filter) { return RT(pfit_wh2o, @@ -1924,7 +1924,7 @@ class SkyStatus: public RefractiveIndexProfile double RT(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid, + size_t spwid, const vector &spwId_filter, const Percent &signalgain) { @@ -1941,7 +1941,7 @@ class SkyStatus: public RefractiveIndexProfile double skycoupling, double tspill, double airmass, - unsigned int spwid, + size_t spwid, const vector &spwId_filter, const Percent &signalgain); @@ -1949,15 +1949,15 @@ class SkyStatus: public RefractiveIndexProfile double RTRJ(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { return RTRJ(pfit_wh2o, skycoupling, tspill, airMass_, spwid, nc); } double RTRJ(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid) + size_t spwid) { return RTRJ(pfit_wh2o, skycoupling, tspill, airMass_, spwid); } @@ -1965,17 +1965,17 @@ class SkyStatus: public RefractiveIndexProfile double skycoupling, double tspill, double airmass, - unsigned int spwId, - unsigned int nc); + size_t spwId, + size_t nc); double RTRJ(double pfit_wh2o, double skycoupling, double tspill, double airmass, - unsigned int spwid) + size_t spwid) { double trj_channel = 0.0; - for(unsigned int n = 0; n < v_numChan_[spwid]; n++) { + for(size_t n = 0; n < v_numChan_[spwid]; n++) { trj_channel = trj_channel + RTRJ(pfit_wh2o, skycoupling, tspill, @@ -1989,11 +1989,11 @@ class SkyStatus: public RefractiveIndexProfile double RTRJ(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid, + size_t spwid, const Percent &signalgain) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwid]; n++) { + for(size_t n = 0; n < v_numChan_[spwid]; n++) { spwId_filter.push_back(1.0); } return RTRJ(pfit_wh2o, @@ -2009,11 +2009,11 @@ class SkyStatus: public RefractiveIndexProfile double skycoupling, double tspill, double airmass, - unsigned int spwid, + size_t spwid, const Percent &signalgain) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwid]; n++) { + for(size_t n = 0; n < v_numChan_[spwid]; n++) { spwId_filter.push_back(1.0); } return RTRJ(pfit_wh2o, @@ -2028,7 +2028,7 @@ class SkyStatus: public RefractiveIndexProfile double RTRJ(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid, + size_t spwid, const vector &spwId_filter) { return RTRJ(pfit_wh2o, @@ -2043,7 +2043,7 @@ class SkyStatus: public RefractiveIndexProfile double RTRJ(double pfit_wh2o, double skycoupling, double tspill, - unsigned int spwid, + size_t spwid, const vector &spwId_filter, const Percent &signalgain) { @@ -2060,11 +2060,11 @@ class SkyStatus: public RefractiveIndexProfile double skycoupling, double tspill, double airmass, - unsigned int spwid, + size_t spwid, const vector &spwId_filter, const Percent &signalgain); - + private: // no accessors provided for these diff --git a/src/libaatm/include/ATMSpectralGrid.h b/src/libaatm/include/ATMSpectralGrid.h index 2a21f6a..267e286 100644 --- a/src/libaatm/include/ATMSpectralGrid.h +++ b/src/libaatm/include/ATMSpectralGrid.h @@ -83,8 +83,8 @@ class SpectralGrid * @post the spectral window has been defined; it is taken as a spectral window * with no sideband. Its spectral window identifier spwId is 0. */ - SpectralGrid(unsigned int numChan, - unsigned int refChan, + SpectralGrid(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep); @@ -101,7 +101,7 @@ class SpectralGrid * @post the spectral window has been defined; it is taken as a spectral window * with no sideband. Its spectral window identifier spwId is 0. */ - SpectralGrid(unsigned int numChan, + SpectralGrid(size_t numChan, double refFreq, double* chanFreq, const std::string &freqUnits); @@ -126,8 +126,8 @@ class SpectralGrid * Their spectral window identifiers are 0 and 1. The identifier is 0 and 1 for the lower * and upper sidebands if the input netSideband is 0, 1, 3 or 5 else it is 1 and 0 respectively. */ - SpectralGrid(unsigned int numChan, - unsigned int refChan, + SpectralGrid(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep, const Frequency &intermediateFreq, @@ -149,8 +149,8 @@ class SpectralGrid * @post the spectral window has been defined; it is taken as a spectral window * with no sideband. Its spectral window identifier spwId is 0. */ - SpectralGrid(unsigned int numChan, - unsigned int refChan, + SpectralGrid(size_t numChan, + size_t refChan, double* chanFreq, const std::string &freqUnits); @@ -170,8 +170,8 @@ class SpectralGrid * @post the spectral window has been defined and appended to the set of spectral windows; * this new spectral window is taken as one with no sideband. */ - unsigned int add(unsigned int numChan, - unsigned int refChan, + size_t add(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep); @@ -185,8 +185,8 @@ class SpectralGrid * @post the spectral window has been defined and appended to the set of spectral windows; * this new spectral window is taken as one with no sideband. */ - unsigned int add(unsigned int numChan, - unsigned int refChan, + size_t add(size_t numChan, + size_t refChan, double* chanFreq, const std::string &freqUnits); @@ -200,19 +200,19 @@ class SpectralGrid * @post the spectral window has been defined and appended to the set of spectral windows; * this new spectral window is taken as one with no sideband. */ - unsigned int add(unsigned int numChan, + size_t add(size_t numChan, double refFreq, double* chanFreq, const std::string &freqUnits); - unsigned int add(unsigned int numChan, + size_t add(size_t numChan, double refFreq, const std::vector &chanFreq, const std::string &freqUnits); - unsigned int add(const std::vector &chanFreq) + size_t add(const std::vector &chanFreq) { - unsigned int spwid; + size_t spwid; std::vector v; - for(unsigned int i = 0; i < chanFreq.size(); i++) { + for(size_t i = 0; i < chanFreq.size(); i++) { v.push_back(chanFreq[i].get("GHz")); } spwid = add(chanFreq.size(), chanFreq[0].get("GHz"), v, "GHz"); @@ -232,8 +232,8 @@ class SpectralGrid * the frequency for the middle of that sideband. For DSB refFreq may be in between the two sideband. */ - void add(unsigned int numChan, - unsigned int refChan, + void add(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep, const Frequency &intermediateFreq, @@ -244,17 +244,17 @@ class SpectralGrid /** Accessor to the number of spectral wondows * @return number of spectral windows */ - unsigned int getNumSpectralWindow() const; + size_t getNumSpectralWindow() const; /** Accessor to the number of frequency points for the first spectral window * @return number of frequency channels */ - unsigned int getNumChan() const; + size_t getNumChan() const; /** Accessor to the number of frequency points for a given spectral window * @param spwId spectral window identifier (0-based) * @return number of frequency channels */ - unsigned int getNumChan(unsigned int spwId) const; + size_t getNumChan(size_t spwId) const; /** Accessor to the reference channel of the first spectral window * @return the reference channel @@ -262,12 +262,12 @@ class SpectralGrid * there is no way to determine the reference channel if the grid is not regularily sampled! would that be * the case, the returned value is 0. */ - unsigned int getRefChan() const; + size_t getRefChan() const; /** Accessor to the reference channel for a given spectral window * @param spwId spectral window identifier (0-based) * @return the reference channel */ - unsigned int getRefChan(unsigned int spwId) const; + size_t getRefChan(size_t spwId) const; // Frequency getRefFreq(); /** Accessor to the reference frequency (Hz) for the first spectral window @@ -279,7 +279,7 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return the frequency at the reference channel position */ - Frequency getRefFreq(unsigned int spwId) const; + Frequency getRefFreq(size_t spwId) const; /** Accessor to the channel separation for regularily spaced grids (for the first spectral window) * @return the channel separation (Hz) @@ -290,22 +290,22 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return the channel separation (Hz) */ - Frequency getChanSep(unsigned int spwId) const; + Frequency getChanSep(size_t spwId) const; /** Accessor to the frequency (Hz) for a given grid point (for the first spectral window) * @param chanNum the channel number (grid units) * @ return the frequency (Hz) corresponding to the center of the channel */ - Frequency getChanFreq(unsigned int chanNum) const; - Frequency getChanWidth(unsigned int chanNum) const; + Frequency getChanFreq(size_t chanNum) const; + Frequency getChanWidth(size_t chanNum) const; /** Accessor to the frequency (Hz) for a given grid point for the specified spectral window * @param spwId spectral window identifier (0-based) * @param chanNum the channel number (grid units) * @ return the frequency (Hz) corresponding to the center of the channel */ - Frequency getChanFreq(unsigned int spwId, unsigned int chanNum) const; - Frequency getChanWidth(unsigned int spwId, unsigned int chanNum) const; + Frequency getChanFreq(size_t spwId, size_t chanNum) const; + Frequency getChanWidth(size_t spwId, size_t chanNum) const; /** Accessor to the frequencies in the specified units for a given channel index (0-based) for the @@ -316,15 +316,15 @@ class SpectralGrid * @return the frequencies corresponding to the center of the channel in the specified units for * the input spectral window and for the corresponding channel in the other sideband */ - std::vector getSbChanFreq(unsigned int spwId, - unsigned int chanNum, + std::vector getSbChanFreq(size_t spwId, + size_t chanNum, const std::string &freqUnits) const; /** Accessor to retrieve the spectral grid of a spectral window * @param spwId spectral window identifier (0-based) * @return a std::vector of numChan frequencies (Hz) */ - std::vector getSpectralWindow(unsigned int spwId) const; + std::vector getSpectralWindow(size_t spwId) const; /** Method to get the grid position for a given frequency specified in Hz (the first spectral window) * @return the grid position @@ -335,7 +335,7 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return the grid position */ - double getChanNum(unsigned int spwId, double freq) const; + double getChanNum(size_t spwId, double freq) const; /** Method to get the frequency range encompassing the list of frequency grid points (for the first spectral window) * \note In case of irregular sampling the return value is the difference between the frequencies of the channels @@ -352,7 +352,7 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return the frequency bandwidth (Hz) */ - Frequency getBandwidth(unsigned int spwId) const; + Frequency getBandwidth(size_t spwId) const; /** Method to get the frequency (Hz) for the point at the lowest frequency (for the first spectral window) * @return the frequency of the channel at the lowest frequency @@ -364,7 +364,7 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return the frequency (Hz) of the channel at the lowest frequency */ - Frequency getMinFreq(unsigned int spwId) const; + Frequency getMinFreq(size_t spwId) const; /** Method to get the frequency (Hz) for the point at the largest frequency (for the first spectral window) * @return the frequency (Hz) of the channel at the highest frequency @@ -375,7 +375,7 @@ class SpectralGrid * @param units the requested units * @return the frequency (Hz) of the channel at the highest frequency */ - Frequency getMaxFreq(unsigned int spwId) const; + Frequency getMaxFreq(size_t spwId) const; /** Method to know if the spectral grid is regular or not (the first spectral window) * @return true if uniformly sampled, else false @@ -385,14 +385,14 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return true if uniformly sampled, else false */ - bool isRegular(unsigned int spwId) const; + bool isRegular(size_t spwId) const; /** Accessor for the side of the sideband * @param spwId spectral window identifier (0-based) * @return the side of the sideband * \note Possible result is no sideband (NoSB) or lower sideband (LSB) or upper sideband (USB) */ - std::string getSidebandSide(unsigned int spwId) const; + std::string getSidebandSide(size_t spwId) const; /** Accessor to the nature(s) of the associated spectral window(s) * @pre the spectral window must have an associated sideband. Would that not be the @@ -400,7 +400,7 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return the associated nature(s) of the associated spectral windows */ - std::vector getAssocNature(unsigned int spwId) const; + std::vector getAssocNature(size_t spwId) const; /** Accessor to the identifier of the associated spectral window(s) * @pre the spectral window must have an associated spectral window. Would that not be the @@ -408,9 +408,9 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return the identifiers of the its associated spectral windows */ - std::vector getAssocSpwId(unsigned int spwId) const; + std::vector getAssocSpwId(size_t spwId) const; - std::vector getAssocSpwIds(const std::vector &spwIds) const; + std::vector getAssocSpwIds(const std::vector &spwIds) const; /** Accessor for the type of sideband * @pre the spectral window must have an associated spectral window. Would that not be the @@ -420,7 +420,7 @@ class SpectralGrid * \note Possible result is double sideband (DSB) or single sideband (SSB) or two sidebands (2SB). * 2SB implies sideband separation which is possible only in the interferometric case */ - std::string getSidebandType(unsigned int spwId) const; + std::string getSidebandType(size_t spwId) const; /** Accessor for the side of the sideband and its type * @pre the spectral window must have a sideband side and a sideband type. Would that not be the @@ -428,10 +428,10 @@ class SpectralGrid * @param spwId spectral window identifier (0-based) * @return the side and the type of the sideband */ - std::string getSideband(unsigned int spwId) const; + std::string getSideband(size_t spwId) const; double getLoFrequency() const; - double getLoFrequency(unsigned int spwId) const; + double getLoFrequency(size_t spwId) const; //@} @@ -441,8 +441,8 @@ class SpectralGrid std::string freqUnits_; //!< The frequency inits (always Hz) std::vector v_chanFreq_; //!< Channel frequencies of ALL the channels (i.e. all spectral window appended) - std::vector v_numChan_; //!< number of channels for every spectral window - std::vector v_refChan_; //!< reference channel for every spectral window + std::vector v_numChan_; //!< number of channels for every spectral window + std::vector v_refChan_; //!< reference channel for every spectral window std::vector v_refFreq_; //!< frequency at reference channel for every spectral window std::vector v_chanSep_; //!< channel separation for every spectral window std::vector v_maxFreq_; //!< frequency maximum for every spectral window @@ -452,16 +452,16 @@ class SpectralGrid std::vector v_sidebandSide_; // v_sidebandType_; // > vv_assocSpwId_; // > vv_assocSpwId_; // > vv_assocNature_; // v_transfertId_; + std::vector v_transfertId_; private: - void appendChanFreq(unsigned int numChan, double* chanFreq); - void appendChanFreq(unsigned int numChan, const std::vector &chanFreq); - bool wrongSpwId(unsigned int spwId) const; + void appendChanFreq(size_t numChan, double* chanFreq); + void appendChanFreq(size_t numChan, const std::vector &chanFreq); + bool wrongSpwId(size_t spwId) const; }; inline bool SpectralGrid::operator ==(const SpectralGrid & a) const diff --git a/src/libaatm/include/ATMTemperature.h b/src/libaatm/include/ATMTemperature.h index 6fc781c..c96d668 100644 --- a/src/libaatm/include/ATMTemperature.h +++ b/src/libaatm/include/ATMTemperature.h @@ -72,10 +72,12 @@ class Temperature Temperature operator*(float scf) { return Temperature(valueIS_ * (double) scf); } Temperature operator*(int scf) { return Temperature(valueIS_ * (double) scf); } Temperature operator*(unsigned int scf) { return Temperature(valueIS_ * (double) scf); } + Temperature operator*(size_t scf) { return Temperature(valueIS_ * (double) scf); } Temperature operator/(double scf) { return Temperature(valueIS_ / scf); } Temperature operator/(float scf) { return Temperature(valueIS_ / (double) scf); } Temperature operator/(int scf) { return Temperature(valueIS_ / (double) scf); } Temperature operator/(unsigned int scf) { return Temperature(valueIS_ / (double) scf); } + Temperature operator/(size_t scf) { return Temperature(valueIS_ / (double) scf); } bool operator<(const Temperature &rhs) const { return (valueIS_ < rhs.get()); } bool operator>(const Temperature &rhs) const { return (valueIS_ > rhs.get()); } bool operator<=(const Temperature &rhs) const { return (valueIS_ <= rhs.get()); } @@ -90,5 +92,3 @@ class Temperature ATM_NAMESPACE_END #endif /*!_ATM_TEMPERATURE_H*/ - - diff --git a/src/libaatm/include/ATMWaterVaporRadiometer.h b/src/libaatm/include/ATMWaterVaporRadiometer.h index 099b70d..0b08908 100644 --- a/src/libaatm/include/ATMWaterVaporRadiometer.h +++ b/src/libaatm/include/ATMWaterVaporRadiometer.h @@ -51,13 +51,13 @@ class WaterVaporRadiometer WaterVaporRadiometer() {} /** Class constructor with identifiers of radiometric channels. Sky Coupling = 1.0, Sideband Gain: 50% (no spilloverTemperature given) */ - WaterVaporRadiometer(const vector &IdChannels); + WaterVaporRadiometer(const vector &IdChannels); /** Class constructor with identifiers of radiometric channels. Sideband Gain: 50% (no spilloverTemperature given) */ - WaterVaporRadiometer(const vector &IdChannels, + WaterVaporRadiometer(const vector &IdChannels, const vector &skyCoupling); - inline WaterVaporRadiometer(const vector &IdChannels, + inline WaterVaporRadiometer(const vector &IdChannels, double skyCoupling) { WaterVaporRadiometer(IdChannels, vector (IdChannels.size(), @@ -65,32 +65,32 @@ class WaterVaporRadiometer } /** Class constructor with identifiers of radiometric channels. Sky Coupling = 1.0 (no spilloverTemperature given) */ - WaterVaporRadiometer(const vector &IdChannels, + WaterVaporRadiometer(const vector &IdChannels, const vector &signalGain); - /* WaterVaporRadiometer(vector IdChannels, Percent signalGain); */ + /* WaterVaporRadiometer(vector IdChannels, Percent signalGain); */ /** Full class constructor (no spilloverTemperature given) */ - WaterVaporRadiometer(const vector &IdChannels, + WaterVaporRadiometer(const vector &IdChannels, const vector &skyCoupling, const vector &signalGain); /** Class constructor with identifiers of radiometric channels. Sky Coupling = 1.0, Sideband Gain: 50% (spilloverTemperature given) */ - WaterVaporRadiometer(const vector &IdChannels, + WaterVaporRadiometer(const vector &IdChannels, const Temperature &spilloverTemperature); /** Class constructor with identifiers of radiometric channels. Sideband Gain: 50% (spilloverTemperature given) */ - WaterVaporRadiometer(const vector &IdChannels, + WaterVaporRadiometer(const vector &IdChannels, const vector &skyCoupling, const Temperature &spilloverTemperature); /** Class constructor with identifiers of radiometric channels. Sky Coupling = 1.0 (spilloverTemperature given) */ - WaterVaporRadiometer(const vector &IdChannels, + WaterVaporRadiometer(const vector &IdChannels, const vector &signalGain, const Temperature &spilloverTemperature); /** Full class constructor (spilloverTemperature given) */ - WaterVaporRadiometer(const vector &IdChannels, + WaterVaporRadiometer(const vector &IdChannels, const vector &skyCoupling, const vector &signalGain, const Temperature &spilloverTemperature); @@ -98,7 +98,7 @@ class WaterVaporRadiometer virtual ~WaterVaporRadiometer(); /** Accessor to identifiers of radiometric channels (vector of int) */ - inline vector getIdChannels() const { return IdChannels_; } + inline vector getIdChannels() const { return IdChannels_; } /** Accessor to Sky coupling of the different radiometric channels (vector of double) */ inline vector getSkyCoupling() const { return skyCoupling_; } @@ -106,12 +106,12 @@ class WaterVaporRadiometer /** Multiplier of the Sky coupling vector */ inline void multiplySkyCoupling(double factor) { - for(unsigned int i = 0; i < skyCoupling_.size(); i++) { + for(size_t i = 0; i < skyCoupling_.size(); i++) { skyCoupling_[i] = skyCoupling_[i] * factor; } } /** Multiplier of one Sky coupling channel */ - inline void multiplySkyCouplingChannel(unsigned int ichan, double factor) + inline void multiplySkyCouplingChannel(size_t ichan, double factor) { skyCoupling_[ichan] = skyCoupling_[ichan] * factor; } @@ -119,13 +119,13 @@ class WaterVaporRadiometer /** Setter of the Sky coupling vector to a single Sky Coupling value */ inline void setSkyCoupling(double factor) { - /* for(unsigned int i=0; i::iterator it(skyCoupling_.begin()), itmax(skyCoupling_.end()); it != itmax; ++it) { (*it) = factor; } } - inline void setSkyCoupling(unsigned int i, double factor) + inline void setSkyCoupling(size_t i, double factor) { if(i < skyCoupling_.size()) { skyCoupling_[i] = factor; @@ -141,7 +141,7 @@ class WaterVaporRadiometer inline void setSpilloverTemperature(Temperature spilloverTemperature) { spilloverTemperature_ = spilloverTemperature; } protected: - vector IdChannels_; + vector IdChannels_; vector skyCoupling_; vector signalGain_; Temperature spilloverTemperature_; diff --git a/src/libaatm/src/ATMProfile.cpp b/src/libaatm/src/ATMProfile.cpp index df7e6b2..ab1ee51 100644 --- a/src/libaatm/src/ATMProfile.cpp +++ b/src/libaatm/src/ATMProfile.cpp @@ -33,11 +33,11 @@ ATM_NAMESPACE_BEGIN -AtmProfile::AtmProfile(unsigned int n) +AtmProfile::AtmProfile(size_t n) { numLayer_ = n; initBasicAtmosphericParameterThresholds(); - for(unsigned int i = 0; i < numLayer_; ++i) { + for(size_t i = 0; i < numLayer_; ++i) { v_layerO3_.push_back(0.0); v_layerCO_.push_back(0.0); v_layerN2O_.push_back(0.0); @@ -67,7 +67,7 @@ AtmProfile::AtmProfile(const Length &altitude, const Pressure &pressureStep, double pressureStepFactor, const Length &topAtmProfile, - unsigned int atmType) : + size_t atmType) : // Atmospheretype atmType): typeAtm_(atmType), groundTemperature_(groundTemperature), tropoLapseRate_(tropoLapseRate), groundPressure_(groundPressure), @@ -91,7 +91,7 @@ AtmProfile::AtmProfile(const Length &altitude, const Pressure &pressureStep, double pressureStepFactor, const Length &topAtmProfile, - unsigned int atmType, + size_t atmType, const vector &v_layerBoundaries, const vector &v_layerTemperature): typeAtm_(atmType), groundTemperature_(groundTemperature), @@ -104,20 +104,20 @@ AtmProfile::AtmProfile(const Length &altitude, numLayer_ = mkAtmProfile(); initBasicAtmosphericParameterThresholds(); newBasicParam_ = true; - unsigned int nL1 = v_layerBoundaries.size(); - unsigned int nL2 = v_layerTemperature.size(); + size_t nL1 = v_layerBoundaries.size(); + size_t nL2 = v_layerTemperature.size(); if(nL1 == nL2 ) { double h=altitude_.get("m"); double h0; double h1; double counter; double avT; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { h0=h; h1 = h0 + v_layerThickness_[n]; counter = 0.0; avT = 0.0; - for(unsigned int m = 0; m < nL1; m++) { + for(size_t m = 0; m < nL1; m++) { if( h0 <= v_layerBoundaries[m].get("m") && h1 >= v_layerBoundaries[m].get("m") ){ // std::cout << "n=" << n << " h0=" << h0 << " h1=" << h1 << " v_layerBoundaries[" << m << "]=" << v_layerBoundaries[m].get("m") << std::endl; avT = avT + v_layerTemperature[m].get("K"); @@ -140,7 +140,7 @@ AtmProfile::AtmProfile(const Length &altitude, double tropoLapseRate, const Humidity &relativeHumidity, const Length &wvScaleHeight, - unsigned int atmType) : + size_t atmType) : // Atmospheretype atmType): typeAtm_(atmType), groundTemperature_(groundTemperature), tropoLapseRate_(tropoLapseRate), groundPressure_(groundPressure), @@ -161,14 +161,14 @@ AtmProfile::AtmProfile(const Length &altitude, const vector &v_layerWaterVapor) { newBasicParam_ = true; - unsigned int nL1 = v_layerThickness.size(); - unsigned int nL2 = v_layerPressure.size(); - unsigned int nL3 = v_layerTemperature.size(); - unsigned int nL4 = v_layerWaterVapor.size(); + size_t nL1 = v_layerThickness.size(); + size_t nL2 = v_layerPressure.size(); + size_t nL3 = v_layerTemperature.size(); + size_t nL4 = v_layerWaterVapor.size(); if(nL1 + 1 == nL2 && nL2 == nL3 && nL3 == nL4) { numLayer_ = nL1; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerO3_.push_back(0.0); v_layerCO_.push_back(0.0); v_layerN2O_.push_back(0.0); @@ -197,15 +197,15 @@ AtmProfile::AtmProfile(const vector &v_layerBoundaries, const vector &v_layerWaterVapor) { newBasicParam_ = true; - unsigned int nL1 = v_layerBoundaries.size(); - unsigned int nL2 = v_layerPressure.size(); - unsigned int nL3 = v_layerTemperature.size(); - unsigned int nL4 = v_layerWaterVapor.size(); + size_t nL1 = v_layerBoundaries.size(); + size_t nL2 = v_layerPressure.size(); + size_t nL3 = v_layerTemperature.size(); + size_t nL4 = v_layerWaterVapor.size(); if(nL1 == nL2 && nL2 == nL3 && nL3 == nL4) { numLayer_ = nL1 - 1; altitude_ = v_layerBoundaries[0]; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerO3_.push_back(0.0); v_layerCO_.push_back(0.0); v_layerN2O_.push_back(0.0); @@ -235,14 +235,14 @@ AtmProfile::AtmProfile(const Length &altitude, const vector &v_layerWaterVapor) { newBasicParam_ = true; - unsigned int nL1 = v_layerThickness.size(); - unsigned int nL2 = v_layerPressure.size(); - unsigned int nL3 = v_layerTemperature.size(); - unsigned int nL4 = v_layerWaterVapor.size(); + size_t nL1 = v_layerThickness.size(); + size_t nL2 = v_layerPressure.size(); + size_t nL3 = v_layerTemperature.size(); + size_t nL4 = v_layerWaterVapor.size(); if(nL1 + 1 == nL2 && nL2 == nL3 && nL3 == nL4) { numLayer_ = nL1; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerO3_.push_back(0.0); v_layerCO_.push_back(0.0); v_layerN2O_.push_back(0.0); @@ -274,15 +274,15 @@ AtmProfile::AtmProfile(const vector &v_layerBoundaries, const vector &v_layerWaterVapor) { newBasicParam_ = true; - unsigned int nL1 = v_layerBoundaries.size(); - unsigned int nL2 = v_layerPressure.size(); - unsigned int nL3 = v_layerTemperature.size(); - unsigned int nL4 = v_layerWaterVapor.size(); + size_t nL1 = v_layerBoundaries.size(); + size_t nL2 = v_layerPressure.size(); + size_t nL3 = v_layerTemperature.size(); + size_t nL4 = v_layerWaterVapor.size(); if(nL1 == nL2 && nL2 == nL3 && nL3 == nL4) { numLayer_ = nL1 - 1; altitude_ = v_layerBoundaries[0]; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerO3_.push_back(0.0); v_layerCO_.push_back(0.0); v_layerN2O_.push_back(0.0); @@ -316,15 +316,15 @@ AtmProfile::AtmProfile(const Length &altitude, const vector &v_layerO3) { newBasicParam_ = true; - unsigned int nL1 = v_layerThickness.size(); - unsigned int nL2 = v_layerPressure.size(); - unsigned int nL3 = v_layerTemperature.size(); - unsigned int nL4 = v_layerWaterVapor.size(); - unsigned int nL5 = v_layerO3.size(); + size_t nL1 = v_layerThickness.size(); + size_t nL2 = v_layerPressure.size(); + size_t nL3 = v_layerTemperature.size(); + size_t nL4 = v_layerWaterVapor.size(); + size_t nL5 = v_layerO3.size(); if(nL1 * 1 == nL2 && nL2 == nL3 && nL3 == nL4 && nL4 == nL5) { numLayer_ = nL1; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerO3_.push_back(v_layerO3[n].get("m**-3")); v_layerCO_.push_back(0.0); v_layerN2O_.push_back(0.0); @@ -355,15 +355,15 @@ AtmProfile::AtmProfile(const Length &altitude, const vector &v_layerO3) { newBasicParam_ = true; - unsigned int nL1 = v_layerThickness.size(); - unsigned int nL2 = v_layerPressure.size(); - unsigned int nL3 = v_layerTemperature.size(); - unsigned int nL4 = v_layerWaterVapor.size(); - unsigned int nL5 = v_layerO3.size(); + size_t nL1 = v_layerThickness.size(); + size_t nL2 = v_layerPressure.size(); + size_t nL3 = v_layerTemperature.size(); + size_t nL4 = v_layerWaterVapor.size(); + size_t nL5 = v_layerO3.size(); if(nL1 + 1 == nL2 && nL2 == nL3 && nL3 == nL4 && nL4 == nL5) { numLayer_ = nL1; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerO3_.push_back(v_layerO3[n].get("m**-3")); v_layerCO_.push_back(0.0); v_layerN2O_.push_back(0.0); @@ -401,20 +401,20 @@ AtmProfile::AtmProfile(const Length &altitude, const vector &v_layerSO2) { newBasicParam_ = true; - unsigned int nL1 = v_layerThickness.size(); - unsigned int nL2 = v_layerPressure.size(); - unsigned int nL3 = v_layerTemperature.size(); - unsigned int nL4 = v_layerWaterVapor.size(); - unsigned int nL5 = v_layerO3.size(); - unsigned int nL6 = v_layerCO.size(); - unsigned int nL7 = v_layerN2O.size(); - unsigned int nL8 = v_layerNO2.size(); - unsigned int nL9 = v_layerSO2.size(); + size_t nL1 = v_layerThickness.size(); + size_t nL2 = v_layerPressure.size(); + size_t nL3 = v_layerTemperature.size(); + size_t nL4 = v_layerWaterVapor.size(); + size_t nL5 = v_layerO3.size(); + size_t nL6 = v_layerCO.size(); + size_t nL7 = v_layerN2O.size(); + size_t nL8 = v_layerNO2.size(); + size_t nL9 = v_layerSO2.size(); if(nL1 + 1 == nL2 && nL2 == nL3 && nL3 == nL4 && nL4 == nL5 && nL5 == nL6 && nL6 == nL7 && nL7 == nL8 && nL8 == nL9) { numLayer_ = nL1; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerO3_.push_back(v_layerO3[n].get("m**-3")); v_layerCO_.push_back(v_layerCO[n].get("m**-3")); v_layerN2O_.push_back(v_layerN2O[n].get("m**-3")); @@ -449,20 +449,20 @@ AtmProfile::AtmProfile(const Length &altitude, const vector &v_layerSO2) { newBasicParam_ = true; - unsigned int nL1 = v_layerThickness.size(); - unsigned int nL2 = v_layerPressure.size(); - unsigned int nL3 = v_layerTemperature.size(); - unsigned int nL4 = v_layerWaterVapor.size(); - unsigned int nL5 = v_layerO3.size(); - unsigned int nL6 = v_layerCO.size(); - unsigned int nL7 = v_layerN2O.size(); - unsigned int nL8 = v_layerNO2.size(); - unsigned int nL9 = v_layerSO2.size(); + size_t nL1 = v_layerThickness.size(); + size_t nL2 = v_layerPressure.size(); + size_t nL3 = v_layerTemperature.size(); + size_t nL4 = v_layerWaterVapor.size(); + size_t nL5 = v_layerO3.size(); + size_t nL6 = v_layerCO.size(); + size_t nL7 = v_layerN2O.size(); + size_t nL8 = v_layerNO2.size(); + size_t nL9 = v_layerSO2.size(); if(nL1 + 1 == nL2 && nL2 == nL3 && nL3 == nL4 && nL4 == nL5 && nL5 == nL6 && nL6 == nL7 && nL7 == nL8 && nL8 == nL9) { numLayer_ = nL1; - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerO3_.push_back(v_layerO3[n].get("m**-3")); v_layerCO_.push_back(v_layerCO[n].get("m**-3")); v_layerN2O_.push_back(v_layerN2O[n].get("m**-3")); @@ -519,7 +519,7 @@ AtmProfile::AtmProfile(const AtmProfile &a) v_layerNO2_.reserve(numLayer_); v_layerSO2_.reserve(numLayer_); // std::cout << "numLayer_=" << numLayer_ << std::endl; COMMENTED OUT BY JUAN MAY/16/2005 - for(unsigned int n = 0; n < numLayer_; n++) { + for(size_t n = 0; n < numLayer_; n++) { v_layerThickness_.push_back(a.v_layerThickness_[n]); v_layerTemperature_.push_back(a.v_layerTemperature_[n]); v_layerTemperature0_.push_back(a.v_layerTemperature0_[n]); @@ -542,7 +542,7 @@ AtmProfile::AtmProfile(const AtmProfile &a) groundTemperatureThreshold_ = a.groundTemperatureThreshold_; tropoLapseRateThreshold_ = a.tropoLapseRateThreshold_; relativeHumidityThreshold_ = a.relativeHumidityThreshold_; - wvScaleHeightThreshold_ = a.wvScaleHeightThreshold_; + wvScaleHeightThreshold_ = a.wvScaleHeightThreshold_; } void AtmProfile::setBasicAtmosphericParameterThresholds(const Length &altitudeThreshold, const Pressure &groundPressureThreshold, @@ -556,13 +556,13 @@ void AtmProfile::setBasicAtmosphericParameterThresholds(const Length &altitudeTh groundTemperatureThreshold_ = groundTemperatureThreshold; tropoLapseRateThreshold_ = tropoLapseRateThreshold; relativeHumidityThreshold_ = relativeHumidityThreshold; - wvScaleHeightThreshold_ =wvScaleHeightThreshold; + wvScaleHeightThreshold_ =wvScaleHeightThreshold; } void AtmProfile::initBasicAtmosphericParameterThresholds() { altitudeThreshold_ = Length(1.0,"m"); - groundPressureThreshold_ = Pressure(99.,"Pa"); // DB 2014-03-06 : Choose 99 Pascal instead of 100 Pascal because the threshold must be lower than the value of delta_pressure used in getAverageDispersiveDryPathLength_GroundPressureDerivative() + groundPressureThreshold_ = Pressure(99.,"Pa"); // DB 2014-03-06 : Choose 99 Pascal instead of 100 Pascal because the threshold must be lower than the value of delta_pressure used in getAverageDispersiveDryPathLength_GroundPressureDerivative() groundTemperatureThreshold_ = Temperature(0.3,"K"); tropoLapseRateThreshold_ = 0.01; relativeHumidityThreshold_ = Humidity(100.,"%"); @@ -581,9 +581,9 @@ bool AtmProfile::updateAtmProfile(const Length &altitude, if(fabs(altitude_.get()-altitude.get())>0.1)mkNewProfile=true; */ - unsigned int numLayer; + size_t numLayer; bool mkNewProfile = false; - + // if(altitude_.get() != altitude.get()) mkNewProfile = true; //if(mkNewProfile)cout<<"altitude has changed" < altitudeThreshold_.get()) { // Length(0.1,"m").get()) { - mkNewProfile = true; + mkNewProfile = true; //cout<<"altitude has changed" < groundPressureThreshold_.get()) { // Pressure(100.,"Pa").get()) { - mkNewProfile = true; + mkNewProfile = true; //cout<<"ground pressure has changed" < groundTemperatureThreshold_.get()) { // Temperature(0.3,"K").get()) { - mkNewProfile = true; + mkNewProfile = true; //cout<<"ground temperature has changed"< wvScaleHeightThreshold_.get()) { // Length(20.,"m").get() ) { - mkNewProfile = true; + mkNewProfile = true; //cout<<"wv scale height has changed" < tropoLapseRateThreshold_) { // 0.01) { - mkNewProfile = true; + mkNewProfile = true; //cout<<"tropo lapse rate has changed" < relativeHumidityThreshold_.get()) { // Humidity(100.,"%").get()) { - mkNewProfile = true; + mkNewProfile = true; //cout<<"relative humidity has changed" < AtmProfile::getTemperatureProfile() const { vector t; t.reserve(v_layerTemperature_.size()); - for(unsigned int i = 0; i < v_layerTemperature_.size(); i++) { + for(size_t i = 0; i < v_layerTemperature_.size(); i++) { Temperature tt(v_layerTemperature_[i], "K"); t.push_back(tt); } return t; } -Temperature AtmProfile::getLayerTemperature(unsigned int i) const +Temperature AtmProfile::getLayerTemperature(size_t i) const { /*if(i > v_layerTemperature_.size() - 1) { Temperature t(-999.0, "K"); @@ -698,7 +698,7 @@ Temperature AtmProfile::getLayerTemperature(unsigned int i) const return Temperature(v_layerTemperature_[i], "K"); } -Temperature AtmProfile::getLayerBottomTemperature(unsigned int i) const +Temperature AtmProfile::getLayerBottomTemperature(size_t i) const { if(i > v_layerTemperature0_.size() - 1) { std::ostringstream oss; @@ -708,7 +708,7 @@ Temperature AtmProfile::getLayerBottomTemperature(unsigned int i) const return Temperature(v_layerTemperature0_[i], "K"); } -Temperature AtmProfile::getLayerTopTemperature(unsigned int i) const +Temperature AtmProfile::getLayerTopTemperature(size_t i) const { if(i > v_layerTemperature1_.size() - 1) { std::ostringstream oss; @@ -723,14 +723,14 @@ void AtmProfile::setAltitude(const Length &groundaltitude) { if (groundaltitude <= altitude_){ - + // std::cout << "extrapolar para abajo" << std::endl; int nextralayers = int( 0.50001+(altitude_-groundaltitude).get("m")/v_layerThickness_[0]); if (nextralayers == 0) {nextralayers=1;} // std::cout << "aaa=" << ( 0.50001+(altitude_-groundaltitude).get("m")/v_layerThickness_[0]) << std::endl; double newThickness = (altitude_-groundaltitude).get("m") / nextralayers; - + // std::cout << "Number of extra layers: " << nextralayers << " of thickness = " << newThickness << " m" << std::endl; // std::cout << "nextralayers-1 " << nextralayers-1 << std::endl; @@ -749,10 +749,10 @@ void AtmProfile::setAltitude(const Length &groundaltitude) v_layerO3_.push_back(v_layerO3_[0]); v_layerN2O_.push_back(v_layerN2O_[0]); v_layerNO2_.push_back(v_layerNO2_[0]); - v_layerSO2_.push_back(v_layerSO2_[0]); + v_layerSO2_.push_back(v_layerSO2_[0]); } - for(int i=v_layerThickness_.size()-1; i>nextralayers-1; i--){ + for(long int i=v_layerThickness_.size()-1; i>nextralayers-1; i--){ v_layerThickness_[i] = v_layerThickness_[i-nextralayers]; v_layerTemperature_[i] = v_layerTemperature_[i-nextralayers]; v_layerTemperature0_[i] = v_layerTemperature0_[i-nextralayers]; @@ -771,7 +771,7 @@ void AtmProfile::setAltitude(const Length &groundaltitude) } // std::cout << "nextralayers=" << nextralayers << std::endl; - + for(int i=nextralayers; i>0 ; i--){ v_layerThickness_[i-1] = newThickness; @@ -780,9 +780,9 @@ void AtmProfile::setAltitude(const Length &groundaltitude) v_layerTemperature_[i-1] = (v_layerTemperature0_[i]+v_layerTemperature1_[i])/2.0; v_layerPressure1_[i-1] = v_layerPressure0_[i]; - v_layerPressure0_[i-1] = v_layerPressure0_[i]* exp(-0.0341695 * + v_layerPressure0_[i-1] = v_layerPressure0_[i]* exp(-0.0341695 * (-newThickness)/ v_layerTemperature_[i-1] ); - v_layerPressure_[i-1] = exp((log(v_layerPressure0_[i-1])+ log(v_layerPressure1_[i-1]))/2.0); + v_layerPressure_[i-1] = exp((log(v_layerPressure0_[i-1])+ log(v_layerPressure1_[i-1]))/2.0); v_layerWaterVapor1_[i-1] = v_layerWaterVapor0_[i]; v_layerWaterVapor0_[i-1] = v_layerWaterVapor0_[i]*(v_layerPressure0_[i-1]/v_layerPressure0_[i]); @@ -805,8 +805,8 @@ void AtmProfile::setAltitude(const Length &groundaltitude) double cumulheight = 0.0; // std::cout << "before v_layerTemperature_.size()=" << v_layerTemperature_.size() << std::endl; - - for(unsigned int i=0; i AtmProfile::getThicknessProfile() const { vector l; l.reserve(v_layerThickness_.size()); - for(unsigned int i = 0; i < v_layerThickness_.size(); i++) { + for(size_t i = 0; i < v_layerThickness_.size(); i++) { Length ll(v_layerThickness_[i], "m"); l.push_back(ll); } return l; } -Length AtmProfile::getLayerThickness(unsigned int i) const +Length AtmProfile::getLayerThickness(size_t i) const { /*if(i > v_layerThickness_.size() - 1) { Length l(-999.0, "m"); @@ -908,7 +908,7 @@ Length AtmProfile::getLayerThickness(unsigned int i) const return Length(v_layerThickness_[i], "m"); } -Length AtmProfile::getLayerBottomHeightAboveGround(unsigned int i) const +Length AtmProfile::getLayerBottomHeightAboveGround(size_t i) const { if(i > v_layerThickness_.size() - 1) { std::ostringstream oss; @@ -916,13 +916,13 @@ Length AtmProfile::getLayerBottomHeightAboveGround(unsigned int i) const throw AtmException(ATM_EXCEPTION_ARGS(oss.str().c_str())); } double h=0.0; - for(unsigned int j = 0; j < i; j++) { + for(size_t j = 0; j < i; j++) { h = h + v_layerThickness_[j]; } return Length(h, "m"); } -Length AtmProfile::getLayerTopHeightAboveGround(unsigned int i) const +Length AtmProfile::getLayerTopHeightAboveGround(size_t i) const { if(i > v_layerThickness_.size() - 1) { std::ostringstream oss; @@ -930,13 +930,13 @@ Length AtmProfile::getLayerTopHeightAboveGround(unsigned int i) const throw AtmException(ATM_EXCEPTION_ARGS(oss.str().c_str())); } double h=0.0; - for(unsigned int j = 0; j < i+1; j++) { + for(size_t j = 0; j < i+1; j++) { h = h + v_layerThickness_[j]; } return Length(h, "m"); } -Length AtmProfile::getLayerBottomHeightAboveSeaLevel(unsigned int i) const +Length AtmProfile::getLayerBottomHeightAboveSeaLevel(size_t i) const { if(i > v_layerThickness_.size() - 1) { std::ostringstream oss; @@ -944,13 +944,13 @@ Length AtmProfile::getLayerBottomHeightAboveSeaLevel(unsigned int i) const throw AtmException(ATM_EXCEPTION_ARGS(oss.str().c_str())); } double h=altitude_.get("m"); - for(unsigned int j = 0; j < i; j++) { + for(size_t j = 0; j < i; j++) { h = h + v_layerThickness_[j]; } return Length(h, "m"); } -Length AtmProfile::getLayerTopHeightAboveSeaLevel(unsigned int i) const +Length AtmProfile::getLayerTopHeightAboveSeaLevel(size_t i) const { if(i > v_layerThickness_.size() - 1) { std::ostringstream oss; @@ -958,21 +958,21 @@ Length AtmProfile::getLayerTopHeightAboveSeaLevel(unsigned int i) const throw AtmException(ATM_EXCEPTION_ARGS(oss.str().c_str())); } double h=altitude_.get("m"); - for(unsigned int j = 0; j < i+1; j++) { + for(size_t j = 0; j < i+1; j++) { h = h + v_layerThickness_[j]; } return Length(h, "m"); } -void AtmProfile::setLayerThickness(unsigned int i, const Length &layerThickness) +void AtmProfile::setLayerThickness(size_t i, const Length &layerThickness) { if(i < v_layerThickness_.size()) { v_layerThickness_[i] = layerThickness.get("m"); } } -MassDensity AtmProfile::getLayerWaterVaporMassDensity(unsigned int i) const +MassDensity AtmProfile::getLayerWaterVaporMassDensity(size_t i) const { /*if(i > v_layerWaterVapor_.size() - 1) { MassDensity m(-999.0, "kgm**-3"); @@ -988,7 +988,7 @@ MassDensity AtmProfile::getLayerWaterVaporMassDensity(unsigned int i) const } return MassDensity(v_layerWaterVapor_[i], "kgm**-3"); } -MassDensity AtmProfile::getLayerBottomWaterVaporMassDensity(unsigned int i) const +MassDensity AtmProfile::getLayerBottomWaterVaporMassDensity(size_t i) const { if(i > v_layerWaterVapor0_.size() - 1) { std::ostringstream oss; @@ -997,7 +997,7 @@ MassDensity AtmProfile::getLayerBottomWaterVaporMassDensity(unsigned int i) cons } return MassDensity(v_layerWaterVapor0_[i], "kgm**-3"); } -MassDensity AtmProfile::getLayerTopWaterVaporMassDensity(unsigned int i) const +MassDensity AtmProfile::getLayerTopWaterVaporMassDensity(size_t i) const { if(i > v_layerWaterVapor1_.size() - 1) { std::ostringstream oss; @@ -1007,7 +1007,7 @@ MassDensity AtmProfile::getLayerTopWaterVaporMassDensity(unsigned int i) const return MassDensity(v_layerWaterVapor1_[i], "kgm**-3"); } -NumberDensity AtmProfile::getLayerWaterVaporNumberDensity(unsigned int i) const +NumberDensity AtmProfile::getLayerWaterVaporNumberDensity(size_t i) const { /*if(i > v_layerWaterVapor_.size() - 1) { NumberDensity m(-999.0, "m**-3"); @@ -1024,7 +1024,7 @@ NumberDensity AtmProfile::getLayerWaterVaporNumberDensity(unsigned int i) const } return NumberDensity(v_layerWaterVapor_[i] * 6.023e23 * 1000.0 / 18.0, "m**-3"); } -NumberDensity AtmProfile::getLayerBottomWaterVaporNumberDensity(unsigned int i) const +NumberDensity AtmProfile::getLayerBottomWaterVaporNumberDensity(size_t i) const { if(i > v_layerWaterVapor0_.size() - 1) { std::ostringstream oss; @@ -1033,7 +1033,7 @@ NumberDensity AtmProfile::getLayerBottomWaterVaporNumberDensity(unsigned int i) } return NumberDensity(v_layerWaterVapor0_[i] * 6.023e23 * 1000.0 / 18.0, "m**-3"); } -NumberDensity AtmProfile::getLayerTopWaterVaporNumberDensity(unsigned int i) const +NumberDensity AtmProfile::getLayerTopWaterVaporNumberDensity(size_t i) const { if(i > v_layerWaterVapor1_.size() - 1) { std::ostringstream oss; @@ -1043,14 +1043,14 @@ NumberDensity AtmProfile::getLayerTopWaterVaporNumberDensity(unsigned int i) con return NumberDensity(v_layerWaterVapor1_[i] * 6.023e23 * 1000.0 / 18.0, "m**-3"); } -void AtmProfile::setLayerWaterVaporMassDensity(unsigned int i, const MassDensity &layerWaterVapor) +void AtmProfile::setLayerWaterVaporMassDensity(size_t i, const MassDensity &layerWaterVapor) { if(i <= v_layerWaterVapor_.size() - 1) { v_layerWaterVapor_[i] = layerWaterVapor.get("kgm**-3"); } } -void AtmProfile::setLayerWaterVaporNumberDensity(unsigned int i, const NumberDensity &layerWaterVapor) +void AtmProfile::setLayerWaterVaporNumberDensity(size_t i, const NumberDensity &layerWaterVapor) { if(i <= v_layerWaterVapor_.size() - 1) { v_layerWaterVapor_[i] = layerWaterVapor.get("m**-3") * 18.0 / (6.023e23 * 1000.0); @@ -1061,14 +1061,14 @@ vector AtmProfile::getPressureProfile() const { vector p; p.reserve(v_layerPressure_.size()); - for(unsigned int i = 0; i < v_layerPressure_.size(); i++) { + for(size_t i = 0; i < v_layerPressure_.size(); i++) { Pressure pp(v_layerPressure_[i], "mb"); p.push_back(pp); } return p; } -Pressure AtmProfile::getLayerPressure(unsigned int i) const +Pressure AtmProfile::getLayerPressure(size_t i) const { /*if(i > v_layerPressure_.size() - 1) { Pressure p(-999.0, "mb"); @@ -1085,7 +1085,7 @@ Pressure AtmProfile::getLayerPressure(unsigned int i) const return Pressure(v_layerPressure_[i], "mb"); } -Pressure AtmProfile::getLayerBottomPressure(unsigned int i) const +Pressure AtmProfile::getLayerBottomPressure(size_t i) const { if(i > v_layerPressure0_.size() - 1) { std::ostringstream oss; @@ -1095,7 +1095,7 @@ Pressure AtmProfile::getLayerBottomPressure(unsigned int i) const return Pressure(v_layerPressure0_[i], "mb"); } -Pressure AtmProfile::getLayerTopPressure(unsigned int i) const +Pressure AtmProfile::getLayerTopPressure(size_t i) const { if(i > v_layerPressure1_.size() - 1) { std::ostringstream oss; @@ -1109,7 +1109,7 @@ Pressure AtmProfile::getLayerTopPressure(unsigned int i) const Length AtmProfile::getGroundWH2O() const { double wm = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { wm = wm + v_layerWaterVapor_[j] * v_layerThickness_[j]; // kg/m**2 or mm (from m*kg/m**3 IS units) } wm = wm * 1e-3; // (pasar de mm a m) @@ -1153,9 +1153,9 @@ Humidity AtmProfile::rwat_inv(const Temperature &tt, const MassDensity &dd, cons return Humidity(rinv, "%"); } -vector AtmProfile::st76(const Length &h, unsigned int tip) const +vector AtmProfile::st76(const Length &h, size_t tip) const { - unsigned int i1, i2, i3, i_layer; + size_t i1, i2, i3, i_layer; double x1, x2, x3, d; vector minorden; NumberDensity o3den, n2oden, coden, no2den, so2den; @@ -1373,40 +1373,40 @@ vector AtmProfile::st76(const Length &h, unsigned int tip) const // --------------------------------------------[ altitude for interpolation ] if((ha < 0.0) || (ha > 120.0)) { - + o3den = NumberDensity(0.0, "m**-3"); n2oden = NumberDensity(0.0, "m**-3"); coden = NumberDensity(0.0, "m**-3"); no2den = NumberDensity(0.0, "m**-3"); so2den = NumberDensity(0.0, "m**-3"); - + } else { - + i1 = 0; i2 = 0; i3 = 0; x1 = 0.0; x2 = 0.0; x3 = 0.0; - + for(i_layer = 0; i_layer < 50; i_layer++) { - + if(ha < alt[i_layer]) { - + if(i_layer == 49) { - + i1 = i_layer - 2; i2 = i_layer - 1; i3 = i_layer; - + } else { - + if(i_layer == 0) { - + i1 = i_layer; i2 = i_layer + 1; i3 = i_layer + 2; - + } else { - + i1 = i_layer - 1; i2 = i_layer; i3 = i_layer + 1; - + } - + } - + x1 = alt[i1]; x2 = alt[i2]; x3 = alt[i3]; goto calc; } @@ -1446,16 +1446,16 @@ vector AtmProfile::st76(const Length &h, unsigned int tip) const // --------------------------------------------[ OZONE ] - o3den= NumberDensity(poli2(ha, x1, x2, x3, ozone[tip - 1][i1], ozone[tip- 1][i2], ozone[tip - 1][i3]) + o3den= NumberDensity(poli2(ha, x1, x2, x3, ozone[tip - 1][i1], ozone[tip- 1][i2], ozone[tip - 1][i3]) * 1e-12 * d * avogad / airmwt,"cm**-3"); if(i2 < 30){ // FIX 15/11/2018 o3den=o3den*0.82; // FIX 15/11/2018 }else{ // FIX 15/11/2018 o3den=o3den*1.65; // FIX 15/11/2018 } // FIX 15/11/2018 - + // std::cout << "ha o3den " << ha << " " << o3den.get() << std::endl; - + // OZONO=A+B*HA+C*HA2 // en ppmv // --------------------------------------------[ N2O ] @@ -1510,7 +1510,7 @@ double AtmProfile::poli2(double ha, return a + b * ha + c * pow(ha, 2); } -unsigned int AtmProfile::mkAtmProfile() +size_t AtmProfile::mkAtmProfile() { static const double hx[20] = { 9.225, 10.225, 11.225, 12.850, 14.850, 16.850, 18.850, 22.600, 26.600, 30.600, @@ -1567,7 +1567,7 @@ unsigned int AtmProfile::mkAtmProfile() double dt = tropoLapseRate_; // TODO implementer des unites (K/km) ici localement double prLimit; double minmin; - + if(typeAtm_ == 1) { prLimit = 100.0; // 100.0 230.2; } else if(typeAtm_ == 2) { @@ -1585,25 +1585,25 @@ unsigned int AtmProfile::mkAtmProfile() prLimit = 100.0; // 250.0; } - unsigned int npp = 0; // number of layers initialized + size_t npp = 0; // number of layers initialized double rt = 6371.2E+0; // Earth radius in km double g0 = 9.80665E+0; // Earth gravity at the surface (m/s**2) // static bool first = true; // [-Wunused_but_set_variable] - unsigned int i; - unsigned int i0; - unsigned int j; - unsigned int k; + size_t i; + size_t i0; + size_t j; + size_t k; // double wh2o, wh2o0; // [-Wunused_but_set_variable] double wgr0; double g = g0; double www, altura; // double abun_ozono, abun_n2o, abun_co; NumberDensity ozono, n2o, co; - double wgr, dh; -// double humrel; // [-Wunused_but_set_variable] + double wgr, dh; +// double humrel; // [-Wunused_but_set_variable] // bool errcode; //int nmaxLayers=40; // FV peut etre devrions nos avoir un garde-fou au cas ou le nb de couches serait stupidement trop grand @@ -1673,7 +1673,7 @@ unsigned int AtmProfile::mkAtmProfile() if( (v_layerPressure[i - 1] - dp * pow(dp1, i - 1) <= prLimit ) ) { //&& (v_layerTemperature[i - 1] <= tx[typeAtm_ - 1][0]) ) { // &&(fabs(prLimit-v_layerPressure[i - 1]-dp*pow(dp1,i-1))>=20.0) ) { if(control) { - + //std::cout << "capa " << i-1 << " temperature=" << v_layerTemperature[i - 1] << " K " << " tx[0]=" << tx[typeAtm_ - 1][0] << std::endl; // std::cout << "prLimit=" << prLimit << std::endl; @@ -1699,18 +1699,18 @@ unsigned int AtmProfile::mkAtmProfile() (fabs(v_layerPressure[i - 1] - dp * pow(dp1, i - 1) - px[typeAtm_ - 1][k])) <= minmin ) { j = k; - + /* std::cout << "P=" << v_layerPressure[i - 1] - dp * pow(dp1, i - 1) << " prLimit=" << prLimit << " px[" << typeAtm_ - 1 << "][" << k << "]=" << px[typeAtm_ - 1][k] << std::endl; */ minmin = fabs(v_layerPressure[i - 1] - dp * pow(dp1, i - 1) - px[typeAtm_ - 1][k]); /* std::cout << " minmin=" << minmin << std::endl; */ - + } - + } - + } // std::cout << "i,j,v_layerPressure.size()-1=" << i << "," << j << "," << v_layerPressure.size() - 1 << std::endl; @@ -1722,7 +1722,7 @@ unsigned int AtmProfile::mkAtmProfile() if(i < v_layerPressure.size() - 1) { if(control) { - int j0 = (j>0) ? j-1:0; + size_t j0 = (j>0) ? j-1:0; v_layerPressure[i] = px[typeAtm_ - 1][j0]; v_layerTemperature[i] = tx[typeAtm_ - 1][j0]; @@ -1744,7 +1744,7 @@ unsigned int AtmProfile::mkAtmProfile() v_layerWaterVapor[i] = wgr0 * exp(-v_layerThickness[i] / (1000.0 * h0)); } else { if(control) { - int j0 = (j>0) ? j-1:0; + size_t j0 = (j>0) ? j-1:0; v_layerPressure.push_back(px[typeAtm_ - 1][j0]); v_layerTemperature.push_back(tx[typeAtm_ - 1][j0]); //- tx[typeAtm_ - 1][0] + v_layerTemperature[i0]); COMMENTED OUT 31/5/2017 @@ -1773,7 +1773,7 @@ unsigned int AtmProfile::mkAtmProfile() } else { // std::cout << "i,j,v_layerPressure.size()-1=" << i << "," << j << "," << v_layerPressure.size() - 1 << std::endl; - + if(i > v_layerPressure.size() - 1) { v_layerPressure.push_back(v_layerPressure[i - 1] - dp * pow(dp1, i - 1)); @@ -1805,9 +1805,9 @@ unsigned int AtmProfile::mkAtmProfile() // std::cout << "old prLimit =" << prLimit << std::endl; prLimit=v_layerPressure[i]; //14NOV2017 // std::cout << "new prLimit =" << prLimit << std::endl; - } - -// humrel = rwat_inv(Temperature(v_layerTemperature[i], "K"), + } + +// humrel = rwat_inv(Temperature(v_layerTemperature[i], "K"), // MassDensity(v_layerWaterVapor[i], "gm**-3"), // Pressure(v_layerPressure[i], "mb")).get("%"); @@ -1849,17 +1849,17 @@ unsigned int AtmProfile::mkAtmProfile() */ - for(unsigned int jj = 0; jj < npp; jj++) { + for(size_t jj = 0; jj < npp; jj++) { v_layerTemperature0.push_back(v_layerTemperature[jj]); v_layerTemperature1.push_back(v_layerTemperature[jj + 1]); v_layerPressure0.push_back(v_layerPressure[jj]); - v_layerPressure1.push_back(v_layerPressure[jj + 1]); + v_layerPressure1.push_back(v_layerPressure[jj + 1]); v_layerWaterVapor0.push_back(1.0E-3*v_layerWaterVapor[jj]); - v_layerWaterVapor1.push_back(1.0E-3*v_layerWaterVapor[jj + 1]); - + v_layerWaterVapor1.push_back(1.0E-3*v_layerWaterVapor[jj + 1]); + } - + for(j = 0; j < npp; j++) { v_layerThickness[j] = (v_layerThickness[j + 1] - v_layerThickness[j]); // in m @@ -1875,7 +1875,7 @@ unsigned int AtmProfile::mkAtmProfile() // std::cout << "type_=" << type_ << std::endl; // std::cout << "typeAtm_=" << typeAtm_ << std::endl; - unsigned int atmType = typeAtm_; // conversion in int + size_t atmType = typeAtm_; // conversion in int // std::cout << "going to minorden with atmType=" << atmType << std::endl; @@ -1899,8 +1899,8 @@ unsigned int AtmProfile::mkAtmProfile() /* v_layerO3_[j] = 1.E6*abun_ozono; // in m**-3 v_layerCO_[j] = 1.E6*abun_co; // in m**-3 - v_layerN2O_[j] = 1.E6*abun_n2o; // in m**-3 - v_layerNO2_[j] = 1.E6*abun_no2; // in m**-3 + v_layerN2O_[j] = 1.E6*abun_n2o; // in m**-3 + v_layerNO2_[j] = 1.E6*abun_no2; // in m**-3 v_layerSO2_[j] = 1.E6*abun_so2; // in m**-3 */ // v_layerO3.push_back(1.E6*abun_ozono); // in m**-3 @@ -1988,9 +1988,8 @@ unsigned int AtmProfile::mkAtmProfile() v_layerSO2_ = v_layerSO2_aux; // first = false; // ????? [-Wunused_but_set_variable] - + return npp; } ATM_NAMESPACE_END - diff --git a/src/libaatm/src/ATMRefractiveIndex.cpp b/src/libaatm/src/ATMRefractiveIndex.cpp index 26f63db..0d0fbb8 100644 --- a/src/libaatm/src/ATMRefractiveIndex.cpp +++ b/src/libaatm/src/ATMRefractiveIndex.cpp @@ -56,8 +56,8 @@ ATM_NAMESPACE_BEGIN (1.0-exp(-1556.38*1.43/temperature))+ mkSpecificRefractivity_16o16o_vib(temperature,pressure,wvpressure,frequency)*(1.0-2.0*(abun_18o+abun_17o))* exp(-1556.38*1.43/temperature) - +mkSpecificRefractivity_16o18o(temperature,pressure,wvpressure,frequency)*2.0*abun_18o - +mkSpecificRefractivity_16o17o(temperature,pressure,wvpressure,frequency)*2.0*abun_17o + +mkSpecificRefractivity_16o18o(temperature,pressure,wvpressure,frequency)*2.0*abun_18o + +mkSpecificRefractivity_16o17o(temperature,pressure,wvpressure,frequency)*2.0*abun_17o )*o2_mixing_ratio*pressure*100.0/(1.380662e-23*temperature); // if(frequency<143&&frequency>142.21){cout << "O2: " << frequency << " " << ccc << " " << pressure << endl;} @@ -67,11 +67,11 @@ ATM_NAMESPACE_BEGIN } std::complex RefractiveIndex::getRefractivity_o2(double temperature,double pressure,double wvpressure, - double frequency,double width,unsigned int n) + double frequency,double width,size_t n) { std::complex average(0.0,0.0); double newfreq; - for(unsigned int i=0; i RefractiveIndex::getRefractivity_h2o(double temperature,double pressure,double wvpressure, - double frequency,double width,unsigned int n) + double frequency,double width,size_t n) { std::complex average(0.0,0.0); double newfreq; - for(unsigned int i=0; i averagen(real(average)/n,imag(average)/n); return averagen; } - - + + std::complex RefractiveIndex::getSpecificRefractivity_o3(double temperature, double pressure, double frequency){ - + static const double abun_18o=0.0020439; static const double abun_17o=0.0003750; static const double Tex_nu2=1009.5; //(in Kelvin) Degeneracy=1 http://www.cfa.harvard.edu/hitran/vibrational.html static const double Tex_nu1=1588.41; //(in Kelvin) Degeneracy=1 static const double Tex_nu3=1500.48; //(in Kelvin) Degeneracy=1 - - + + double pob_v2=exp(-Tex_nu2/temperature); double pob_v1=exp(-Tex_nu1/temperature); double pob_v3=exp(-Tex_nu3/temperature); - - - std::complex ccc = + + + std::complex ccc = ((1-pob_v2-pob_v1-pob_v3)/(1.0+3.0*(abun_18o+abun_17o)))* ( mkSpecificRefractivity_16o16o16o(temperature,pressure,frequency) @@ -142,23 +142,23 @@ ATM_NAMESPACE_BEGIN +mkSpecificRefractivity_16o16o18o(temperature,pressure,frequency)*(2*abun_18o) +mkSpecificRefractivity_16o17o16o(temperature,pressure,frequency)*(abun_17o) +mkSpecificRefractivity_16o18o16o(temperature,pressure,frequency)*(abun_18o) - ) - +mkSpecificRefractivity_16o16o16o_v2(temperature,pressure,frequency)*pob_v2 - +mkSpecificRefractivity_16o16o16o_v1(temperature,pressure,frequency)*pob_v1 + ) + +mkSpecificRefractivity_16o16o16o_v2(temperature,pressure,frequency)*pob_v2 + +mkSpecificRefractivity_16o16o16o_v1(temperature,pressure,frequency)*pob_v1 +mkSpecificRefractivity_16o16o16o_v3(temperature,pressure,frequency)*pob_v3; //m^2 - + //cout << "temperature=" << temperature << " pob_v2=" << pob_v2 << endl; - + return ccc; - + } - + std::complex RefractiveIndex::getSpecificRefractivity_o3(double temperature,double pressure,double frequency, - double width,unsigned int n) + double width,size_t n) { std::complex average(0.0,0.0); double newfreq; - for(unsigned int i=0; i averagen(real(average)/n,imag(average)/n); return averagen; } - - unsigned int RefractiveIndex::vpIndex(double nu) + + size_t RefractiveIndex::vpIndex(double nu) { - unsigned int vp; + size_t vp; if(nu<1.0){ vp=0; }else{ @@ -310,7 +310,7 @@ ATM_NAMESPACE_BEGIN // double fv=((dv-(vl-v)*itf)/a1+(dv-(vl+v)*itf)/a2); // ! line profile (imaginary) // ! in 1/frec units // double frv=((vl-v+lf)/a1-(vl+v+lf)/a2); // ! delay profile (real part) - + // return std::complex (frv,fv)*(v/vl); return std::complex (v/vl)*(std::complex(1.0,-itf)/std::complex(vl-v,-dv) @@ -327,13 +327,13 @@ ATM_NAMESPACE_BEGIN //////////////////////////////////////////////////////////////////////////////// - std::complex RefractiveIndex::mkSpecificRefractivity(unsigned int species, - double tt, double pp, double eh2o, - double nu, double width, unsigned int n) + std::complex RefractiveIndex::mkSpecificRefractivity(size_t species, + double tt, double pp, double eh2o, + double nu, double width, size_t n) { std::complex average(0.0,0.0); double newfreq; - for(unsigned int i=0; i averagen(real(average)/n,imag(average)/n); return averagen; } - - std::complex RefractiveIndex::mkSpecificRefractivity(unsigned int species, - double tt, double pp, double eh2o, + + std::complex RefractiveIndex::mkSpecificRefractivity(size_t species, + double tt, double pp, double eh2o, double nu) { if(species==1){return mkSpecificRefractivity_16o16o(tt,pp,eh2o,nu);} @@ -377,7 +377,7 @@ ATM_NAMESPACE_BEGIN std::complex aa(0.0,0.0); return aa; } - + //////////////////////// Opacity Source Number: 8 ////////////////////////////// @@ -418,7 +418,7 @@ ATM_NAMESPACE_BEGIN 459.52841,459.66837,459.79990,459.87900,459.93613,459.96918,459.98718,461.87595,463.01144,463.32639,464.28793,465.41611,465.62198,465.75122,465.88190,466.78979,466.88785,469.42245, 471.19046,471.55963,471.89441,472.03772,472.13968,472.52078,472.70630,472.85135,475.19659,475.86591,476.62155,477.46619,478.82608,479.73309,481.16629,481.23663,482.50317,483.99429, 484.20007,484.22736,484.27087,485.20999,488.72867,488.77545,489.81982,490.73245,491.88474,491.93472,494.55759,494.77975,495.84152,496.81067,498.97610,500.43149,500.65533,501.10776}; - + static const double flin[594]={ @@ -526,7 +526,7 @@ ATM_NAMESPACE_BEGIN 2.9565,2.8500,2.7967,2.8500,2.8677,3.1281,2.8056,2.8884,3.0334,2.7612,2.9180,2.7760,2.9890,2.8411,2.9683,2.8292,2.8529,2.9535,3.0690,2.9447, 2.8411,2.9003,2.8292,3.0867,2.8559,3.1193,2.8115,3.0778,3.0423,2.7671,2.8352,2.9979,2.9091,2.9417}; - + static const double pi=3.141592654; static const double picube8div3hcesu=4.1623755E-19; // (8*pi**3/(3*h*c))*(1e-18)**2 = 4.1623755E-19 static const double mu=1.62; //Debyes @@ -534,9 +534,9 @@ ATM_NAMESPACE_BEGIN //double q=1.1346738633*pow(tt,1.5); double q=1.1346738633*tt*sqrt(tt); - // unsigned int vp; - unsigned int ini; - unsigned int ifin; + // size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -574,7 +574,7 @@ ATM_NAMESPACE_BEGIN }else{ - for(unsigned int i=ini; i lshape; std::complex lshapeacum; @@ -745,7 +745,7 @@ ATM_NAMESPACE_BEGIN }else{ - for(unsigned int i=ini; i lshape; std::complex lshapeacum; @@ -938,18 +938,18 @@ ATM_NAMESPACE_BEGIN if(pp<25){ ini=ini3[vp]; ifin=ifin3[vp]; }else{ if(pp<300){ ini=ini2[vp]; ifin=ifin2[vp]; }else{ ini=ini1[vp]; ifin=ifin1[vp]; } } if(ini>4){ini=ini-3;}else{ini=1;} // NEW PATCH 02 SEP 2016 - if(ifin<37){ifin=ifin+3;}else{ifin=39;} // NEW PATCH 02 SEP 2016 - + if(ifin<37){ifin=ifin+3;}else{ifin=39;} // NEW PATCH 02 SEP 2016 + if(ini>0){ini=ini-1;}else{ifin=0;} if(ifin>0){ifin=ifin-1;}else{ifin=0;} - + if(ifin==0||ifin (0.0,0.0); }else{ - for(unsigned int i=ini; i lshape; std::complex lshapeacum; @@ -1145,7 +1145,7 @@ ATM_NAMESPACE_BEGIN }else{ - for(unsigned int i=ini; i (delayh2o,cnth2o); // ( rad m^-1 , m^-1 ) } @@ -1430,7 +1430,7 @@ ATM_NAMESPACE_BEGIN 1.00, 3.00, 1.00, 3.00, 1.00, 3.00, 3.00, 1.00, 1.00, 1.00, 3.00, 3.00, 1.00, 3.00, 1.00}; - static const unsigned int ifin1[800]={ + static const size_t ifin1[800]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -1459,7 +1459,7 @@ ATM_NAMESPACE_BEGIN 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45}; - static const unsigned int ini1[800]={ + static const size_t ini1[800]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -1488,7 +1488,7 @@ ATM_NAMESPACE_BEGIN 42, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44}; - static const unsigned int ifin2[800]={ + static const size_t ifin2[800]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -1517,7 +1517,7 @@ ATM_NAMESPACE_BEGIN 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45, 45}; - static const unsigned int ini2[800]={ + static const size_t ini2[800]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -1546,7 +1546,7 @@ ATM_NAMESPACE_BEGIN 43, 43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44}; - static const unsigned int ifin3[800]={ + static const size_t ifin3[800]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -1575,7 +1575,7 @@ ATM_NAMESPACE_BEGIN 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45}; - static const unsigned int ini3[800]={ + static const size_t ini3[800]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -1612,9 +1612,9 @@ ATM_NAMESPACE_BEGIN //double q=0.034256116*pow(tt,1.5); // Q(300 K)=178.120 JPL Line Catalog double q=0.034256116*tt*sqrt(tt); // Q(300 K)=178.120 JPL Line Catalog - unsigned int vp; - unsigned int ini; - unsigned int ifin; + size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -1636,7 +1636,7 @@ ATM_NAMESPACE_BEGIN }else{ - for(unsigned int i=ini; i lshape; std::complex lshapeacum; @@ -2102,7 +2102,7 @@ ATM_NAMESPACE_BEGIN } - + if(ifin==0||ifin (0.0,0.0); @@ -2111,7 +2111,7 @@ ATM_NAMESPACE_BEGIN // cout << "nu=" << nu << " GHz: including lines from " << fre[ini] << " GHz to " << fre[ifin] << " GHz" << endl; - for(unsigned int i=ini; i lshape; std::complex lshapeacum; @@ -2306,7 +2306,7 @@ ATM_NAMESPACE_BEGIN }else{ - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1}; */ - static const unsigned int ifin11[500]={ + static const size_t ifin11[500]={ 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2374,7 +2374,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - static const unsigned int ini11[500]={ + static const size_t ini11[500]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, @@ -2393,7 +2393,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - static const unsigned int ifin21[500]={ + static const size_t ifin21[500]={ 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2412,7 +2412,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - static const unsigned int ini21[500]={ + static const size_t ini21[500]={ 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2431,7 +2431,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - static const unsigned int ifin31[500]={ + static const size_t ifin31[500]={ 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2450,7 +2450,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - static const unsigned int ini31[500]={ + static const size_t ini31[500]={ 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2469,7 +2469,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - static const unsigned int ifin12[500]={ + static const size_t ifin12[500]={ 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, @@ -2488,7 +2488,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 55, 55, 55, 55, 55, 55, 55, 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 58, 58, 58, 58, 58, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - static const unsigned int ini12[500]={ + static const size_t ini12[500]={ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, @@ -2508,7 +2508,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 56, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57}; - static const unsigned int ifin22[500]={ + static const size_t ifin22[500]={ 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, @@ -2527,7 +2527,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 58, 58, 58, 58, 58, 58, 0, 0, 0, 0, 0}; - static const unsigned int ini22[500]={ + static const size_t ini22[500]={ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, @@ -2546,7 +2546,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 53, 54, 54, 54, 54, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 58, 58, 58, 58, 58}; - static const unsigned int ifin32[500]={ + static const size_t ifin32[500]={ 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, @@ -2565,7 +2565,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 54, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 58, 58, 58, 58, 58, 58, 0, 0, 0}; - static const unsigned int ini32[500]={ + static const size_t ini32[500]={ 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, @@ -2591,9 +2591,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou //double q=0.028263028*pow(tt,1.5); // Q(300 K)=179.639 JPL Line Catalog double q=0.028263028*tt*sqrt(tt); // Q(300 K)=179.639 JPL Line Catalog - unsigned int vp; - unsigned int ini1, ini2; - unsigned int ifin1, ifin2; + size_t vp; + size_t ini1, ini2; + size_t ifin1, ifin2; std::complex lshape; std::complex lshapeacum; @@ -2620,7 +2620,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou }else{ - for(unsigned int i=ini1; i RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou }else{ - for(unsigned int i=ini2; i RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou static const double temp_exp[15]={ .626,.649,.619,.63,.29,.36,.332,.51, .380,.38,.645,.6,.69,.676,.66}; - static const unsigned int ifin1[500]={ + static const size_t ifin1[500]={ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2705,7 +2705,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}; - static const unsigned int ini1[500]={ + static const size_t ini1[500]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2724,7 +2724,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15}; - static const unsigned int ifin2[500]={ + static const size_t ifin2[500]={ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2743,7 +2743,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}; - static const unsigned int ini2[500]={ + static const size_t ini2[500]={ 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2762,7 +2762,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}; - static const unsigned int ifin3[500]={ + static const size_t ifin3[500]={ 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2781,7 +2781,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15}; - static const unsigned int ini3[500]={ + static const size_t ini3[500]={ 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2808,9 +2808,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou //double q=0.034571542*pow(tt,1.5); // Q(300 K)=179.639 JPL Line Catalog double q=0.034571542*tt*sqrt(tt); // Q(300 K)=179.639 JPL Line Catalog - unsigned int vp; - unsigned int ini; - unsigned int ifin; + size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -2833,7 +2833,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou }else{ - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou if(nu>999.9){return std::complex (0.0,0.0);} - for(unsigned int i=0; i<6; i++){ + for(size_t i=0; i<6; i++){ lshape=lineshape(nu,fre[i], linebroadening_o2(fre[i],tt,pp,eh2o,32.0,dv0,0.2),0.0); lshape=lshape*flin[i]*exp(-el[i]/tt)*(1-exp(-0.047992745509*fre[i]/tt)); @@ -2921,7 +2921,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_hdo(double tt, dou if(nu>999.9){return std::complex (0.0,0.0);} - for(unsigned int i=0; i<14; i++){ + for(size_t i=0; i<14; i++){ lshape=lineshape(nu,fre[i],linebroadening_o2(fre[i],tt,pp,eh2o,33.0,dv0,0.2),0.0); lshape=lshape*flin[i]*exp(-el[i]/tt)*(1-exp(-0.047992745509*fre[i]/tt)); @@ -2968,7 +2968,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, if(nu>999.9){return std::complex (0.0,0.0);} - for(unsigned int i=0; i<15; i++){ + for(size_t i=0; i<15; i++){ lshape=lineshape(nu,fre[i], linebroadening_o2(fre[i],tt,pp,eh2o,34.0,dv0,0.2),0.0); lshape=lshape*flin[i]*exp(-el[i]/tt)*(1-exp(-0.047992745509*fre[i]/tt)); @@ -3028,7 +3028,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, {1.900 , .2 , .0 , .0},{1.900 , .2 , .0 , .0},{1.900 , .2 , .0 , .0}}; - static const unsigned int ifin1[800]={ // NEW PATCH 16 SEP 2016 + static const size_t ifin1[800]={ // NEW PATCH 16 SEP 2016 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, @@ -3057,7 +3057,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 54, 54}; // NEW PATCH 16 SEP 2016 - static const unsigned int ini1[800]={ // NEW PATCH 16 SEP 2016 + static const size_t ini1[800]={ // NEW PATCH 16 SEP 2016 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, @@ -3086,7 +3086,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46}; // NEW PATCH 16 SEP 2016 - static const unsigned int ifin2[800]={ // NEW PATCH 16 SEP 2016 + static const size_t ifin2[800]={ // NEW PATCH 16 SEP 2016 37, 37, 37, 37, 37, 37, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, @@ -3115,7 +3115,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50}; // NEW PATCH 16 SEP 2016 - static const unsigned int ini2[800]={ // NEW PATCH 16 SEP 2016 + static const size_t ini2[800]={ // NEW PATCH 16 SEP 2016 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -3150,9 +3150,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, static const double mu=0.0186; //Debyes (M1 Transitions) double q=0.72923*tt; - unsigned int vp; - unsigned int ini; - unsigned int ifin; + size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -3164,9 +3164,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, }else{ vp=vpIndex(nu); - + if(pp<25){ ini=ini2[vp]; ifin=ifin2[vp]; }else{ if(pp<300){ ini=ini1[vp]; ifin=ifin1[vp]; }else{ ini=ini1[vp]; ifin=ifin1[vp]; }} // NEW PATCH 16 SEP 2016 - + if(ini<38&&nu>135.0){ini=38;} if(ini>0){ini=ini-1;}else{ifin=0;} @@ -3178,7 +3178,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, }else{ - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 934.66297,935.01694, 935.07653, 935.29581, 935.67426, 938.35059,938.81009,941.94142, 943.26205, 943.33399, 944.81071, 947.68152,948.47843,950.27326, 953.02120, 957.08315, 959.02762, 959.96394, 960.39622,960.49677, 960.83281, 961.09020, 961.90512, 961.93041,962.17344,963.87630, 966.24899, 966.41783, 967.70572, 968.43274,969.25619,969.47424, 969.84707, 973.41999, 973.61940, 975.44060, 975.56576,981.37877, 981.53804, 982.66663, 983.57350, 984.81783,986.50649,987.26748, 987.81624, 988.47613, 988.83493, 988.94762,989.44755,989.44802, 995.03809, 995.24924, 997.58337, 998.35617 }; - + static const double texpO3[666] ={ 0.77,0.78,0.77,0.76,0.79,0.77,0.79,0.79,0.80,0.77,0.80,0.76,0.77,0.78,0.81,0.76,0.78,0.80,0.80,0.78,0.82,0.76,0.76,0.77,0.77,0.80,0.77,0.79,0.81,0.77,0.77,0.82,0.78, 0.83,0.77,0.77,0.80,0.77,0.81,0.76,0.76,0.82,0.79,0.76,0.83,0.78,0.80,0.79,0.82,0.77,0.77,0.83,0.82,0.81,0.77,0.78,0.83,0.83,0.78,0.76,0.79,0.76,0.77,0.83,0.81,0.78, @@ -3265,11 +3265,11 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 0.78,0.76,0.76,0.79,0.76,0.76,0.77,0.76,0.76,0.76,0.83,0.76,0.77,0.80,0.78,0.82,0.77,0.84,0.77,0.76,0.77,0.84,0.78,0.78,0.76,0.76,0.76,0.78,0.78,0.76,0.77,0.76,0.82, 0.76,0.80,0.76,0.77,0.76,0.84,0.82,0.83,0.76,0.76,0.78,0.78,0.76,0.76,0.82,0.77,0.79,0.76,0.83,0.76,0.79,0.76,0.76,0.76,0.77,0.76,0.83,0.76,0.78,0.76,0.78,0.76,0.83, 0.83,0.77,0.79,0.76,0.78,0.76,0.76,0.76,0.79,0.76,0.77,0.76,0.76,0.83,0.76,0.83,0.76,0.76,0.78,0.83,0.76,0.76,0.83,0.76,0.76,0.77,0.79,0.79,0.76,0.84,0.76,0.76,0.77, - 0.76,0.76,0.76,0.83,0.83,0.78}; + 0.76,0.76,0.76,0.83,0.83,0.78}; + - static const double brdO3air[666] ={ 2.4859,2.2877,2.3439,2.5155,2.1574,2.3883,2.1870,2.2018,2.1338,2.4060,2.1130,2.5895,2.3498,2.2314,2.0953,2.5244,2.3291,2.1130,2.1249,2.2314,2.0687,2.5392,2.7405,2.4149,2.4386,2.1249,2.4771, 2.2166,2.0835,2.3705,2.3439,2.0716,2.2314,2.0598,2.3735,2.3942,2.1338,2.3291,2.0775,2.6428,2.5540,2.0716,2.2018,2.5925,2.0568,2.2492,2.1042,2.1456,2.0598,2.3735,2.2936,2.0568,2.0627,2.0835, @@ -3298,7 +3298,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 2.0509,1.9444,2.3000,2.3000,2.3735,2.1722,2.1574,2.3000,2.0627,2.3000,2.3000,2.4711,2.0450,2.0450,2.5540,2.0598,2.0746,2.3084}; - + static const double flin[666] = { .148E+01, .278E+01, .144E+01, .281E+01, .318E+01, .284E+01, .392E+01, .378E+01, .301E+01, .125E+01, .275E+01, .253E+01, .236E+01, .386E+01, .501E+01, .443E+01, .244E+01, .498E+01, .506E+01, .613E+01, .638E+01, .908E+00, .102E+01, .754E+01, .415E+01, .478E+01, .955E+00, .353E+01, .508E+01, .860E+01, .366E+01, .600E+01, .334E+01, .664E+01, .205E+01, .189E+01, @@ -3339,7 +3339,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, .266E+02, .373E+02, .141E-01, .126E+02, .515E+01, .252E+01, .720E+01, .251E+02, .251E+02, .256E+02, .630E+01, .171E+00, .838E+01, .327E+02, .466E+01, .498E+01, .237E+02, .115E+01}; - + static const double el[666] = { 47.992, 201.070, 80.695, 20.970, 403.476, 96.488, 373.096, 346.143, 465.831, 56.122, 533.230, 2.479, 144.689, 269.119, 633.829, 10.918, 161.444, 597.026, @@ -3385,62 +3385,62 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, static const double picube8div3hcesu=4.1623755E-19; // (8*pi**3/(3*h*c))*(1e-18)**2 = 4.1623755E-19 static const double mu=0.53; //Debyes static const double mmol=48.0; - + //double q=0.6531261*pow(tt,1.5); double q=0.6531261*tt*sqrt(tt); - // unsigned int vp; - unsigned int ini; - unsigned int ifin; + // size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; - + if(nu>999.9){ - + return std::complex (0.0,0.0); - + }else{ // vp=vpIndex(nu); - + // if(pp<100){ ini=ini3[vp]; ifin=ifin3[vp]; }else{ if(pp<300){ ini=ini2[vp]; ifin=ifin2[vp]; }else{ ini=ini1[vp]; ifin=ifin1[vp]; } } - + ini=1; ifin=666; - - // cout << " 16O16O16O_V1 LINES: " << INI << " TO " << IFIN << ENDL; + + // cout << " 16O16O16O_V1 LINES: " << INI << " TO " << IFIN << ENDL; if(ini>0){ini=ini-1;}else{ifin=0;} if(ifin>0){ifin=ifin-1;}else{ifin=0;} - // COUT << "16O16O16O_V1 LINES: " << INI << " TO " << IFIN << ENDL; + // COUT << "16O16O16O_V1 LINES: " << INI << " TO " << IFIN << ENDL; if(ifin==0||ifin (0.0,0.0); - + }else{ - - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_16o16o16o_v3(double tt, double pp, double nu){ @@ -3516,7 +3516,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 0.76,0.78,0.76,0.82,0.82,0.77,0.82,0.76,0.81,0.81,0.76,0.77,0.81,0.76}; - + static const double brdO3air[714] ={ 2.1456,2.4120,2.3291,2.3143,2.1042,2.1042,2.5126,2.3735,2.0568,2.1130,2.3084,2.6250,2.4771,2.5570,2.0687,2.2018,2.1338,2.2166,2.0894,2.4948, 2.4386,2.0716,2.3676,2.4415,2.0716,2.3735,2.0598,2.1249,2.0775,2.3498,2.3912,2.1338,2.6901,2.0687,2.5658,2.0598,2.5155,2.2314,2.0775,2.0568, @@ -3557,7 +3557,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 2.3000,2.4978,2.1456,2.3000}; - + static const double flin[714] = { .450e+01, .515e+01, .527e+01, .274e+01, .934e+01, .103e+02, .244e+01, .259e+01, .740e+01, .100e+02, .515e+01, .309e+01, .715e+01, .706e+01, .124e+02, .743e+01, .978e+01, .717e+01, .933e+01, .106e+02, .218e+01, .124e+02, .681e+01, .136e+02, .121e+02, .429e+01, .126e+02, .954e+01, .701e+01, .448e+01, .159e+02, .919e+01, .309e+01, .856e+01, .131e+01, .787e+01, @@ -3646,24 +3646,24 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, static const double picube8div3hcesu=4.1623755e-19; // (8*pi**3/(3*h*c))*(1e-18)**2 = 4.1623755e-19 static const double mu=0.53; //debyes static const double mmol=48.0; - + //double q=1.321477358*pow(tt,1.5); double q=1.321477358*tt*sqrt(tt); - // unsigned int vp; - unsigned int ini; - unsigned int ifin; + // size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; - + if(nu>999.9){ - + return std::complex (0.0,0.0); - + }else{ - + // vp=vpIndex(nu); - + // if(pp<100){ // ini=ini3[vp]; // ifin=ifin3[vp]; @@ -3676,36 +3676,36 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, // ifin=ifin1[vp]; // } // } - + ini=0; ifin=712; - + if(ini>0){ini=ini-1;}else{ifin=0;} if(ifin>0){ifin=ifin-1;}else{ifin=0;} - + if(ifin==0||ifin (0.0,0.0); - + }else{ - - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, //double q=0.647739935*pow(tt,1.5); double q=0.647739935*tt*sqrt(tt); - // unsigned int vp; - unsigned int ini; - unsigned int ifin; + // size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -3959,7 +3959,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, }else{ - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 0.78,0.77,0.81,0.79,0.77,0.76,0.78,0.76,0.76,0.77,0.79,0.81,0.76,0.78,0.81, 0.77,0.79,0.82,0.78,0.76,0.76,0.71,0.76,0.77,0.82,0.79,0.77,0.79,0.81,0.83, 0.81,0.76,0.76,0.76,0.76,0.77,0.80,0.80,0.82,0.78,0.78,0.76,0.76,0.76,0.77, 0.80,0.79,0.83,0.82,0.76,0.82,0.76,0.76,0.83,0.78,0.76,0.80,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76}; - + static const double brdO3air[1151] ={ // MHz/mb 2.0894,2.0835,2.0450,2.2166,2.4356,2.0716,2.5984,2.0568,2.1722,2.1338, 2.2492,2.0509,2.0598,2.1959,2.0627,2.0568,2.1574,2.3084,2.2403,2.1604, 2.0450,2.1870,2.2669,2.0835,2.6901,2.2877,2.0598,2.1278,2.0953,2.0627, 2.1456,2.0391,2.4859,2.1574,2.0568,2.1130,2.0953,2.1042,2.2877,2.0775, @@ -4234,7 +4234,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, .4830E+01, .4440E+00, .3640E+01, .2480E+01, .3920E+01, .9150E+01, .4950E+00, .9600E+01, .8550E+01, .1000E-01, .4610E+01, .3150E+00, .2280E+01, .4010E+01, .9330E+01, .8740E+01, .9810E+01, .9260E+01, .2020E+00, .5640E+01, .3220E+01, .2080E+01, .8180E+01, .2000E-01, .2590E+02, .9500E+01, .2530E+02, .2470E+02, .2410E+02, .2350E+02, .2290E+02, .2230E+02, .2170E+02, .2110E+02, .2050E+02, .2000E+02, .1940E+02, .1880E+02, .1820E+02, .1760E+02}; - + static const double el[1151]={ 712.962, 751.948, 1527.675, 295.458, 72.409, 769.490, 11.568, 1105.888, 405.486, 497.424, 246.754, 1470.888, 1057.475, 183.068, 856.081, 1154.462, 434.109, 184.357, 144.750, 226.134, 1584.658, 347.970, 225.783, 686.506, 3.643, 110.903, 1010.594, 273.645, 673.097, 833.248, 465.603, 1642.703, 49.321, 405.541, 1414.963, 564.310, @@ -4308,7 +4308,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1613.949, 1559.621, 1506.495, 1454.571,1403.848, 1354.328, 1306.009, 1258.891, 1212.975,1168.260}; - static const unsigned int ifin1[800]={ + static const size_t ifin1[800]={ 7, 8, 10, 11, 11, 11, 11, 12, 15, 18, 21, 22, 22, 23, 24, 25, 26, 29, 29, 29, 30, 33, 34, 36, 38, 38, 40, 41, 43, 47, 47, 47, 48, 51, 53, 54, 55, 55, 55, 55, 55, 55, 57, 59, 59, 62, 64, 65, 65, 65, 68, 69, 70, 70, 71, 72, 72, 74, 76, 79, 80, 81, 82, 84, 84, 86, 87, 91, 91, 92, 92, 92, 95, 96, 96, 96, 96, 98, 100, 101, 102, 103, 104, 106, 107, 108, 108, 111, 112, 115, @@ -4337,7 +4337,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1017,1018,1018,1020,1020,1022,1023,1023,1023,1023,1023,1024,1024,1024,1024,1024,1027,1028,1028,1028,1028,1028,1028,1029,1031,1031,1031,1032,1034,1036, 1040,1043,1046,1049,1055,1063,1078,1078,1079,1079,1079,1082,1082,1082,1082,1083,1084,1084,1085,1086}; - static const unsigned int ini1[800]={ + static const size_t ini1[800]={ 1, 1, 1, 1, 1, 2, 4, 4, 4, 4, 7, 8, 10, 11, 11, 11, 11, 12, 15, 18, 21, 22, 22, 23, 24, 25, 26, 29, 29, 29, 30, 33, 34, 36, 38, 38, 40, 41, 43, 47, 47, 47, 48, 51, 53, 54, 55, 55, 55, 55, 55, 55, 57, 59, 59, 62, 64, 65, 65, 65, 68, 69, 70, 70, 71, 72, 72, 74, 76, 79, 80, 81, 82, 84, 84, 86, 87, 91, 91, 92, 92, 92, 95, 96, 96, 96, 96, 98, 100, 101, @@ -4366,7 +4366,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1010,1011,1013,1015,1015,1015,1015,1015,1016,1017,1017,1018,1018,1020,1020,1022,1023,1023,1023,1023,1023,1024,1024,1024,1024,1024,1027,1028,1028,1028, 1028,1028,1028,1029,1031,1031,1031,1032,1034,1036,1040,1043,1046,1049,1055,1063,1078,1078,1079,1079}; - static const unsigned int ifin2[800]={ + static const size_t ifin2[800]={ 4, 4, 4, 5, 8, 8, 10, 11, 11, 11, 12, 15, 17, 18, 21, 22, 22, 24, 25, 25, 28, 29, 29, 29, 33, 34, 35, 36, 38, 40, 41, 42, 46, 47, 47, 48, 49, 52, 53, 55, 55, 55, 55, 55, 55, 57, 58, 59, 60, 64, 65, 65, 65, 66, 69, 69, 70, 70, 72, 72, 73, 76, 77, 79, 80, 82, 82, 84, 85, 86, 89, 91, 91, 92, 92, 94, 95, 96, 96, 96, 96, 99, 101, 101, 103, 104, 106, 106, 107, 108, @@ -4395,7 +4395,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1015,1016,1017,1017,1017,1018,1018,1020,1021,1023,1023,1023,1023,1023,1024,1024,1024,1024,1024,1026,1027,1028,1028,1028,1028,1028,1028,1029,1031,1031, 1031,1032,1034,1038,1042,1044,1047,1052,1058,1078,1078,1079,1079,1079,1080,1082,1082,1082,1082,1084}; - static const unsigned int ini2[800]={ + static const size_t ini2[800]={ 1, 1, 3, 4, 4, 4, 5, 8, 8, 10, 11, 11, 11, 12, 15, 17, 18, 21, 22, 22, 24, 25, 25, 28, 29, 29, 29, 33, 34, 35, 36, 38, 40, 41, 42, 46, 47, 47, 48, 49, 52, 53, 55, 55, 55, 55, 55, 55, 57, 58, 59, 60, 64, 65, 65, 65, 66, 69, 69, 70, 70, 72, 72, 73, 76, 77, 79, 80, 82, 82, 84, 85, 86, 89, 91, 91, 92, 92, 94, 95, 96, 96, 96, 96, 99, 101, 101, 103, 104, 106, @@ -4424,7 +4424,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1015,1015,1015,1015,1016,1017,1017,1017,1018,1018,1020,1021,1023,1023,1023,1023,1023,1024,1024,1024,1024,1024,1026,1027,1028,1028,1028,1028,1028,1028, 1029,1031,1031,1031,1032,1034,1038,1042,1044,1047,1052,1058,1078,1078,1079,1079,1079,1080,1082,1082}; - static const unsigned int ifin3[800]={ + static const size_t ifin3[800]={ 3, 4, 4, 4, 5, 8, 8, 10, 11, 11, 11, 12, 15, 17, 18, 21, 22, 22, 24, 25, 25, 28, 29, 29, 29, 33, 34, 35, 36, 38, 40, 41, 42, 46, 47, 47, 48, 49, 52, 53, 55, 55, 55, 55, 55, 55, 57, 58, 59, 60, 64, 65, 65, 65, 66, 69, 69, 70, 70, 72, 72, 73, 76, 77, 79, 80, 82, 82, 84, 85, 86, 89, 91, 91, 92, 92, 94, 95, 96, 96, 96, 96, 99, 101, 101, 103, 104, 106, 106, 107, @@ -4453,7 +4453,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1015,1015,1016,1017,1017,1017,1018,1018,1020,1021,1023,1023,1023,1023,1023,1024,1024,1024,1024,1024,1026,1027,1028,1028,1028,1028,1028,1028,1029,1031, 1031,1031,1032,1034,1038,1042,1044,1047,1052,1058,1078,1078,1079,1079,1079,1080,1082,1082,1082,1082}; - static const unsigned int ini3[800]={ + static const size_t ini3[800]={ 1, 3, 4, 4, 4, 5, 8, 8, 10, 11, 11, 11, 12, 15, 17, 18, 21, 22, 22, 24, 25, 25, 28, 29, 29, 29, 33, 34, 35, 36, 38, 40, 41, 42, 46, 47, 47, 48, 49, 52, 53, 55, 55, 55, 55, 55, 55, 57, 58, 59, 60, 64, 65, 65, 65, 66, 69, 69, 70, 70, 72, 72, 73, 76, 77, 79, 80, 82, 82, 84, 85, 86, 89, 91, 91, 92, 92, 94, 95, 96, 96, 96, 96, 99, 101, 101, 103, 104, 106, 106, @@ -4491,9 +4491,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, //double q=0.649698902072*pow(tt,1.5); double q=0.649698902072*tt*sqrt(tt); - unsigned int vp; - unsigned int ini; - unsigned int ifin; + size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -4507,7 +4507,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, if(pp<25){ ini=ini3[vp]; ifin=ifin3[vp]; }else{ if(pp<300){ ini=ini2[vp]; ifin=ifin2[vp]; }else{ ini=ini1[vp]; ifin=ifin1[vp];} } if(ini>21){ini=ini-20;}else{ini=1;} // NEW PATCH 02 SEP 2016 - if(ifin<1132){ifin=ifin+20;}else{ifin=1151;} // NEW PATCH 02 SEP 2016 + if(ifin<1132){ifin=ifin+20;}else{ifin=1151;} // NEW PATCH 02 SEP 2016 if(ini>0){ini=ini-1;}else{ifin=0;} if(ifin>0){ifin=ifin-1;}else{ifin=0;} @@ -4517,7 +4517,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, }else{ - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1050.215, 626.296, 626.296, 1296.265,1332.850, 1332.850, 1244.700, 1288.576, 1004.263, 1194.231, 524.304, 1144.861, 959.428, 1039.114, 1168.604, 1039.093, 1096.791, 1049.720, 915.808, 1003.851, 95.041, 95.041, 372.623, 372.623, 873.402, 959.183}; - + static const double texpO3[1376] ={ 0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.76,0.77,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.77,0.76,0.76,0.76,0.76,0.76,0.78,0.76,0.76, 0.76,0.76,0.76,0.76,0.76,0.76,0.78,0.79,0.76,0.76,0.76,0.77, 0.76,0.76,0.78,0.76,0.76,0.76,0.79,0.76,0.78,0.76,0.76,0.76, @@ -4819,7 +4819,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.77,0.77,0.79,0.76,0.77, 0.77,0.83,0.84,0.83,0.76,0.76,0.76,0.76,0.76,0.76,0.80,0.76, 0.84,0.84,0.84,0.78,0.76,0.76,0.78,0.78,0.80,0.84,0.76,0.76, 0.76,0.78,0.76,0.76,0.77,0.77,0.83,0.83,0.77,0.77,0.80,0.83, 0.76,0.76,0.76,0.84,0.76,0.76,0.83,0.77,0.77,0.76,0.79,0.79, 0.84,0.76,0.83,0.84,0.80,0.83,0.82,0.84,0.76,0.84,0.83,0.83, 0.82,0.83,0.77,0.77,0.76,0.76,0.82,0.82}; - + static const double brdO3air[1376] ={ 2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.3000,2.4120,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.3000,2.5540,2.4623,2.3000,2.3000,2.3000,2.3000,2.3000, 2.2492,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, @@ -4873,8 +4873,8 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 2.2314,2.5540,2.5540,2.2877,2.2877,2.1249,2.0687,2.3000,2.3000, 2.3000,2.1426,2.3000,2.3000,2.3498,2.3498,2.0746,1.9680,2.4711, 2.4711,2.1130,2.0835,2.0331,2.0391,2.0450,1.9621,2.0509,2.3000, 2.0923,2.3498,2.3498,2.0568,2.1841,2.1841,2.0627,2.3000,2.0983, 2.0687,2.1042,2.0746,2.1071,1.9177,2.0627,1.9177,2.0835,2.0923, 2.1160,2.0983,2.5244,2.5244,2.3000,2.3000,2.1249,2.1071}; - - static const unsigned int ifin1[500]={ + + static const size_t ifin1[500]={ 5, 8, 9, 12, 15, 17, 19, 21, 24, 27, 27, 30, 33, 36, 40, 45, 45, 48, 51, 52, 56, 58, 61, 63, 67, 68, 70, 77, 79, 82, 86, 86, 87, 91, 91, 91, 94, 97, 99, 103, 106, 108, 110, 111, 112, 115, 118, 120, 122, 122, 127, 130, 132, 136, 137, 142, 144, 146, 149, 151, 153, 153, 155, 156, 162, 162, 164, 169, 171, 172, 175, 177, 180, 184, 184, 185, 189, 192, 196, 197, 197, 201, 202, 208, 210, 212, 215, 216, 217, 223, @@ -4893,7 +4893,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1244,1248,1248,1250,1253,1254,1255,1259,1260,1261,1262,1264,1269,1273,1275,1276,1280,1280,1282,1289,1289,1291,1292,1296,1300,1304,1306,1307,1310,1311, 1313,1319,1320,1321,1323,1329,1333,1337,1339,1340,1344,1347,1354,1358,1362,1365,1369,1375,1376,1376}; - static const unsigned int ini1[500]={ + static const size_t ini1[500]={ 1, 1, 1, 3, 5, 8, 9, 12, 15, 17, 19, 21, 24, 27, 27, 30, 33, 36, 40, 45, 45, 48, 51, 52, 56, 58, 61, 63, 67, 68, 70, 77, 79, 82, 86, 86, 87, 91, 91, 91, 94, 97, 99, 103, 106, 108, 110, 111, 112, 115, 118, 120, 122, 122, 127, 130, 132, 136, 137, 142, 144, 146, 149, 151, 153, 153, 155, 156, 162, 162, 164, 169, 171, 172, 175, 177, 180, 184, 184, 185, 189, 192, 196, 197, 197, 201, 202, 208, 210, 212, @@ -4912,7 +4912,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1235,1237,1238,1239,1244,1248,1248,1250,1253,1254,1255,1259,1260,1261,1262,1264,1269,1273,1275,1276,1280,1280,1282,1289,1289,1291,1292,1296,1300,1304, 1306,1307,1310,1311,1313,1319,1320,1321,1323,1329,1333,1337,1339,1340,1344,1347,1354,1358,1362,1365}; - static const unsigned int ifin2[500]={ + static const size_t ifin2[500]={ 3, 5, 8, 9, 12, 15, 16, 19, 21, 24, 26, 27, 29, 32, 35, 39, 44, 45, 48, 50, 52, 54, 57, 61, 63, 66, 68, 70, 74, 78, 82, 84, 86, 86, 91, 91, 91, 94, 95, 99, 102, 106, 107, 110, 110, 112, 114, 116, 118, 122, 122, 125, 128, 132, 135, 136, 140, 144, 145, 148, 151, 153, 153, 155, 155, 161, 162, 163, 168, 170, 172, 175, 177, 179, 184, 184, 184, 189, 191, 196, 196, 197, 199, 202, 208, 210, 211, 215, 216, 217, @@ -4931,7 +4931,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1239,1243,1247,1248,1250,1252,1254,1255,1259,1260,1260,1262,1264,1267,1273,1274,1276,1278,1280,1281,1287,1289,1290,1292,1293,1298,1304,1305,1307,1310, 1310,1313,1319,1320,1321,1322,1325,1330,1337,1338,1340,1343,1347,1351,1357,1361,1363,1368,1373,1376}; - static const unsigned int ini2[500]={ + static const size_t ini2[500]={ 1, 3, 4, 6, 9, 10, 12, 15, 18, 20, 23, 25, 27, 27, 30, 34, 36, 40, 45, 45, 49, 52, 53, 56, 60, 61, 64, 68, 68, 73, 77, 81, 84, 86, 86, 88, 91, 91, 92, 94, 97, 101, 103, 107, 108, 110, 111, 113, 115, 118, 120, 122, 123, 127, 131, 132, 136, 138, 142, 144, 147, 149, 152, 153, 155, 155, 157, 162, 162, 166, 169, 171, 172, 176, 177, 181, 184, 184, 185, 190, 195, 196, 197, 198, 201, 205, 208, 211, 213, 215, @@ -4950,7 +4950,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1237,1238,1243,1244,1248,1250,1250,1254,1254,1257,1260,1260,1261,1263,1266,1271,1273,1276,1276,1280,1280,1284,1289,1290,1291,1292,1298,1302,1304,1306, 1307,1310,1311,1316,1320,1321,1321,1325,1329,1335,1337,1340,1341,1346,1348,1354,1359,1362,1368,1370}; - static const unsigned int ifin3[500]={ + static const size_t ifin3[500]={ 3, 4, 6, 9, 10, 12, 15, 18, 20, 23, 25, 27, 27, 30, 34, 36, 40, 45, 45, 49, 52, 53, 56, 60, 61, 64, 68, 68, 73, 77, 81, 84, 86, 86, 88, 91, 91, 92, 94, 97, 101, 103, 107, 108, 110, 111, 113, 115, 118, 120, 122, 123, 127, 131, 132, 136, 138, 142, 144, 147, 149, 152, 153, 155, 155, 157, 162, 162, 166, 169, 171, 172, 176, 177, 181, 184, 184, 185, 190, 195, 196, 197, 198, 201, 205, 208, 211, 213, 215, 217, @@ -4969,7 +4969,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1238,1243,1244,1248,1250,1250,1254,1254,1257,1260,1260,1261,1263,1266,1271,1273,1276,1276,1280,1280,1284,1289,1290,1291,1292,1298,1302,1304,1306,1307, 1310,1311,1316,1320,1321,1321,1325,1329,1335,1337,1340,1341,1346,1348,1354,1359,1362,1368,1370,1376}; - static const unsigned int ini3[500]={ + static const size_t ini3[500]={ 1, 3, 5, 8, 9, 12, 15, 16, 19, 21, 24, 26, 27, 29, 32, 35, 39, 44, 45, 48, 50, 52, 54, 57, 61, 63, 66, 68, 70, 74, 78, 82, 84, 86, 86, 91, 91, 91, 94, 95, 99, 102, 106, 107, 110, 110, 112, 114, 116, 118, 122, 122, 125, 128, 132, 135, 136, 140, 144, 145, 148, 151, 153, 153, 155, 155, 161, 162, 163, 168, 170, 172, 175, 177, 179, 184, 184, 184, 189, 191, 196, 196, 197, 199, 202, 208, 210, 211, 215, 216, @@ -4995,9 +4995,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, //double q=1.387429043*pow(tt,1.5); double q=1.387429043*tt*sqrt(tt); - unsigned int vp; - unsigned int ini; - unsigned int ifin; + size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -5019,7 +5019,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, }else{ - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 0.78,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.77,0.77,0.76, 0.76,0.76,0.76,0.76,0.76,0.77,0.83,0.77,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.78,0.77,0.77,0.76,0.83,0.76,0.76,0.76, 0.76,0.76,0.77,0.77,0.76,0.76,0.76,0.76,0.84,0.76,0.76,0.76, 0.76,0.76,0.84,0.76,0.76,0.76,0.76,0.76,0.83,0.76,0.76,0.77, 0.77,0.76,0.83,0.83,0.76,0.76,0.76,0.76,0.76,0.83,0.76,0.76, 0.76,0.78,0.77,0.76,0.77,0.76,0.76,0.83,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.82,0.76,0.76}; - + static const double brdO3air[1363] ={ 2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.5984,2.2877,2.3000,2.3000,2.3000,2.3000,2.3000,2.6428, 2.3000,2.3000,2.0716,2.0894,2.0894,2.3000,2.2669,2.3000,2.3000, 2.1959,2.1782,2.2166,2.4623,2.1604,2.3000,2.3000,2.3000,2.3000, 2.1722,2.3000,2.2403,2.2403,2.1456,2.3000,2.3000,2.3000,2.4120, 2.5540,2.2640,2.0775,2.3000,2.3000,2.3084,2.3000,2.3000,2.3000, @@ -5371,8 +5371,8 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 2.3000,2.0983,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.1071,2.3000,2.3000}; - - static const unsigned int ifin1[500]={ + + static const size_t ifin1[500]={ 9, 9, 13, 14, 14, 16, 17, 21, 22, 25, 27, 30, 32, 37, 42, 45, 47, 49, 51, 55, 57, 59, 61, 64, 65, 67, 72, 75, 76, 79, 83, 87, 90, 92, 93, 94, 95, 96, 100, 104, 104, 104, 107, 108, 112, 115, 117, 118, 123, 125, 127, 129, 133, 137, 139, 139, 142, 144, 146, 148, 149, 151, 153, 156, 160, 162, 166, 168, 171, 172, 173, 175, 179, 181, 183, 185, 186, 186, 190, 195, 196, 197, 201, 203, 208, 211, 217, 220, 220, 221, @@ -5391,7 +5391,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1235,1237,1239,1243,1247,1247,1248,1250,1252,1253,1257,1259,1260,1264,1264,1270,1273,1274,1274,1276,1280,1283,1286,1286,1292,1293,1293,1297,1304,1305, 1305,1309,1312,1315,1318,1319,1323,1324,1325,1327,1332,1336,1338,1341,1348,1352,1357,1363,1363,1363}; - static const unsigned int ini1[500]={ + static const size_t ini1[500]={ 1, 1, 2, 4, 9, 9, 13, 14, 14, 16, 17, 21, 22, 25, 27, 30, 32, 37, 42, 45, 47, 49, 51, 55, 57, 59, 61, 64, 65, 67, 72, 75, 76, 79, 83, 87, 90, 92, 93, 94, 95, 96, 100, 104, 104, 104, 107, 108, 112, 115, 117, 118, 123, 125, 127, 129, 133, 137, 139, 139, 142, 144, 146, 148, 149, 151, 153, 156, 160, 162, 166, 168, 171, 172, 173, 175, 179, 181, 183, 185, 186, 186, 190, 195, 196, 197, 201, 203, 208, 211, @@ -5410,7 +5410,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1223,1227,1231,1233,1235,1237,1239,1243,1247,1247,1248,1250,1252,1253,1257,1259,1260,1264,1264,1270,1273,1274,1274,1276,1280,1283,1286,1286,1292,1293, 1293,1297,1304,1305,1305,1309,1312,1315,1318,1319,1323,1324,1325,1327,1332,1336,1338,1341,1348,1352}; - static const unsigned int ifin2[500]={ + static const size_t ifin2[500]={ 4, 8, 9, 11, 13, 14, 16, 17, 20, 21, 4, 27, 30, 32, 37, 41, 45, 47, 48, 50, 55, 56, 59, 61, 63, 65, 67, 71, 74, 75, 78, 82, 86, 90, 91, 93, 94, 95, 96, 100, 102, 104, 104, 106, 108, 112, 114, 117, 118, 121,124, 126, 128, 133, 137, 138, 139, 141, 144, 146, 148, 148, 151, 151, 156, 160, 162, 166, 167, 171,171, 173, 174, 178, 181, 182, 185, 185, 186, 189,193, 196, 197, 200, 203, 207, 209, 215, 220, 220, @@ -5429,7 +5429,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1233,1234,1236,1239,1243,1247,1247,1247,1248,1251,1252,1255,1257,1260,1264,1264,1270,1272,1274,1274,1275,1278,1281,1285,1286,1292,1293,1293,1295,1301, 1305,1305,1309,1311,1315,1317,1319,1323,1324,1325,1325,1332,1336,1338,1339,1347,1351,1354,1360,1363}; - static const unsigned int ini2[500]={ + static const size_t ini2[500]={ 1, 2, 6, 9, 9, 13, 14, 15, 16, 18, 21, 22, 25, 27, 30, 34, 39, 43, 46, 47, 50, 54, 55, 58, 60, 61, 65, 66, 68, 73, 75, 76, 80, 83, 89, 91, 92, 93, 94, 96, 98, 102, 104, 104, 104, 108, 110, 113, 116, 117,118, 123, 126, 128, 130, 136, 137, 139, 140, 143, 144, 146, 148, 150, 151, 153, 156, 160, 164, 167,168, 171, 173, 173, 175, 180, 181, 183, 185, 186,186, 192, 196, 196, 199, 201, 205, 209, 214, 218, @@ -5449,7 +5449,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1300,1304,1305,1306,1309,1313,1315,1318,1320,1323,1325,1325,1330,1334,1336,1339,1342,1349,1352,1359}; - static const unsigned int ifin3[500]={ + static const size_t ifin3[500]={ 2, 6, 9, 9, 13, 14, 15, 16, 18, 21, 22, 25, 27, 30, 34, 39, 43, 46, 47, 50, 54, 55, 58, 60, 61, 65, 66, 68, 73, 75, 76, 80, 83, 89, 91, 92, 93, 94, 96, 98, 102, 104, 104, 104, 108, 110, 113, 116, 117, 118, 123, 126, 128, 130, 136, 137, 139, 140, 143, 144, 146, 148, 150, 151, 153, 156, 160, 164, 167, 168, 171, 173, 173, 175, 180, 181, 183, 185, 186, 186, 192, 196, 196, 199, 201, 205, 209, 214, 218, 220, @@ -5469,7 +5469,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 1304,1305,1306,1309,1313,1315,1318,1320,1323,1325,1325,1330,1334,1336,1339,1342,1349,1352,1359,1363}; - static const unsigned int ini3[500]={ + static const size_t ini3[500]={ 2, 4, 8, 9, 11, 13, 14, 16, 17, 20, 21, 24, 27, 30, 32, 37, 41, 45, 47, 48, 50, 55, 56, 59, 61, 63, 65, 67, 71, 74, 75, 78, 82, 86, 90, 91, 93, 94, 95, 96, 100, 102, 104, 104, 106, 108, 112, 114, 117, 118, 121, 124, 126, 128, 133, 137, 138, 139, 141, 144, 146, 148, 148, 151, 151, 156, 160, 162, 166, 167,171, 171, 173, 174, 178, 181, 182, 185, 185, 186,189, 193, 196, 197, 200, 203, 207, 209, 215, 220, @@ -5495,9 +5495,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, //double q=1.344455353*pow(tt,1.5); double q=1.344455353*tt*sqrt(tt); - unsigned int vp; - unsigned int ini; - unsigned int ifin; + size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -5519,7 +5519,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, }else{ - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 0.79,0.83,0.76,0.76,0.76,0.82,0.77,0.76,0.76,0.84,0.78,0.76, 0.82,0.82,0.76,0.76,0.76,0.79,0.76,0.78,0.84,0.76,0.82,0.82, 0.83,0.76,0.76,0.83,0.81,0.76,0.76,0.82,0.78,0.83,0.77,0.82, 0.76,0.81,0.76,0.81,0.77,0.76,0.76,0.80,0.80,0.81,0.83,0.80, 0.80,0.80,0.79,0.79,0.79,0.76,0.79,0.79,0.79,0.78,0.78,0.78, 0.78,0.78,0.78,0.77,0.77,0.77,0.77,0.77,0.77,0.77,0.77,0.76, 0.76,0.83,0.76,0.80,0.77,0.76,0.77,0.76,0.76,0.83,0.77,0.76, 0.81,0.76,0.76,0.83,0.76,0.83,0.76,0.77,0.78,0.76,0.76,0.77, 0.81,0.76,0.78,0.76,0.76,0.76,0.83,0.83,0.77,0.76,0.83}; - + static const double brdO3air[755] ={ 2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.4356,2.3000,2.3000,2.3000,2.3000,2.3439,2.1722,2.3000,2.3000, 2.3498,2.3000,2.3000,2.3000,2.3000,2.1338,2.3000,2.3000,2.3000, 2.3000,2.3000,2.3291,2.2166,2.4060,2.5155,2.3000,2.2314,2.3000, @@ -5728,8 +5728,8 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 2.1722,2.1841,2.1959,2.2078,2.2196,2.2344,2.2462,2.2610,2.2788, 2.2936,2.3113,2.3291,2.3498,2.3705,2.3912,2.4149,2.4415,2.4682, 2.3000,1.9532,2.3000,2.1130,2.5244,2.3000,2.3498,2.3000,2.3000, 1.9858,2.3735,2.3000,2.0953,2.3000,2.3000,1.9799,2.3000,1.9444, 2.3000,2.4978,2.3291,2.3000,2.3000,2.3942,2.0835,2.3000,2.2314, 2.3000,2.0568,2.3000,1.9355,2.0568,2.4711,2.3000,1.9710}; - - static const unsigned int ifin1[500]={ + + static const size_t ifin1[500]={ 3, 4, 5, 6, 6, 7, 9, 11, 12, 13, 14, 18, 18, 21, 24, 27, 30, 30, 30, 30, 31, 33, 34, 36, 38, 39, 41, 41, 43, 44, 45, 46, 48, 49, 49, 51, 53, 54, 55, 56, 58, 61, 63, 63, 64, 65, 65, 66, 67, 70, 71, 72, 73, 74, 77, 79, 81, 82, 83, 84, 85, 86, 87, 87, 87, 89, 90, 92, 92, 93, 95, 97, 97, 99, 101, 101, 103, 106, 108, 108, 111, 111, 112, 113, 117, 118, 118, 120, 120, 120, @@ -5748,7 +5748,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 658, 661, 662, 662, 664, 668, 672, 675, 677, 677, 683, 685, 687, 689, 695, 697, 699, 701, 705, 712, 722, 722, 726, 726, 729, 730, 733, 733, 733, 733, 735, 737, 737, 738, 739, 741, 742, 743, 744, 747, 748, 748, 748, 750, 750, 752, 753, 755, 755, 755}; - static const unsigned int ini1[500]={ + static const size_t ini1[500]={ 1, 1, 1, 1, 3, 4, 5, 6, 6, 7, 9, 11, 12, 13, 14, 18, 18, 21, 24, 27, 30, 30, 30, 30, 31, 33, 34, 36, 38, 39, 41, 41, 43, 44, 45, 46, 48, 49, 49, 51, 53, 54, 55, 56, 58, 61, 63, 63, 64, 65, 65, 66, 67, 70, 71, 72, 73, 74, 77, 79, 81, 82, 83, 84, 85, 86, 87, 87, 87, 89, 90, 92, 92, 93, 95, 97, 97, 99, 101, 101,103, 106, 108, 108, 111, 111, 112, 113, 117, 118, @@ -5767,7 +5767,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 651, 653, 654, 656, 658, 661, 662, 662, 664, 668,672, 675, 677, 677, 683, 685, 687, 689, 695, 697,699, 701, 705, 712, 722, 722, 726, 726, 729, 730, 733, 733, 733, 733, 735, 737, 737, 738, 739, 741,742, 743, 744, 747, 748, 748, 748, 750, 750, 752}; - static const unsigned int ifin2[500]={ + static const size_t ifin2[500]={ 1, 2, 3, 5, 6, 6, 6, 8, 10, 12, 13, 14, 18, 18, 20, 22, 25, 29, 30, 30, 30, 30, 33, 33, 36, 38, 39, 41, 41, 42, 44, 45, 46, 48, 49, 49, 50, 53, 53, 55, 56, 57, 60, 62, 63, 64, 65, 65, 66, 67, 69, 71, 72, 73, 74, 75, 79, 80, 81, 82, 83, 85, 86, 86, 87, 87, 89, 89, 91, 92, 93, 94, 97, 97, 99, 99, 101, 103, 104, 108, 108, 109, 111, 112, 113, 116, 118, 118, 119, 120, @@ -5786,7 +5786,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 655, 657, 661, 662, 662, 663, 668, 672, 674, 677, 677, 682, 683, 687, 689, 695, 696, 698, 700, 705, 710, 722, 722, 724, 726, 727, 729, 732, 733, 733, 733, 733, 736, 737, 738, 739, 741, 742, 742, 744, 747, 748, 748, 748, 749, 750, 752, 753, 753, 755}; - static const unsigned int ini2[500]={ + static const size_t ini2[500]={ 1, 1, 1, 3, 4, 5, 6, 6, 7, 9, 12, 12, 14, 16, 18, 19, 21, 25, 29, 30, 30, 30, 30, 31, 33, 34, 38, 39, 39, 41, 41, 43, 44, 46, 47, 49, 49, 49, 52, 53, 55, 56, 56, 59, 62, 63, 64, 64, 65, 65, 66, 68, 70, 71, 73, 73, 74, 78, 79, 81, 82, 83, 85, 85, 86, 87, 87, 89, 89, 91, 92, 92, 94, 96, 97, 97, 99, 101, 101, 103, 107, 108, 108, 111, 112, 112, 116, 118, 118, 118, @@ -5805,7 +5805,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 653, 655, 656, 658, 661, 662, 662, 664, 670, 672, 676, 677, 680, 683, 686, 687, 690, 696, 698, 700, 702, 707, 720, 722, 722, 726, 726, 729, 731, 733, 733, 733, 733, 735, 737, 738, 739, 739, 742, 742, 743, 745, 747, 748, 748, 748, 750, 750, 752, 753}; - static const unsigned int ifin3[500]={ + static const size_t ifin3[500]={ 1, 1, 3, 4, 5, 6, 6, 7, 9, 12, 12, 14, 16, 18, 19, 21, 25, 29, 30, 30, 30, 30, 31, 33, 34, 38, 39, 39, 41, 41, 43, 44, 46, 47, 49, 49, 49, 52, 53, 55, 56, 56, 59, 62, 63, 64, 64, 65, 65, 66, 68, 70, 71, 73, 73, 74, 78, 79, 81, 82, 83, 85, 85, 86, 87, 87, 89, 89, 91, 92, 92, 94, 96, 97, 97, 99, 101, 101, 103, 107, 108, 108, 111, 112, 112, 116, 118, 118, 118, 120, @@ -5823,9 +5823,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 616, 618, 619, 619, 620, 621, 623, 625, 627, 627, 627, 628, 630, 633, 634, 635, 637, 639, 640, 642, 644, 645, 646, 646, 648, 648, 649, 650, 651, 653, 655, 656, 658, 661, 662, 662, 664, 670, 672, 676, 677, 680, 683, 686, 687, 690, 696, 698, 700, 702, 707, 720, 722, 722, 726, 726, 729, 731, 733, 733, 733, 733, 735, 737, 738, 739, 739, 742, 742, 743, 745, 747, 748, 748, 748, 750, 750, 752, 753, 755}; - - static const unsigned int ini3[500]={ + + static const size_t ini3[500]={ 1, 1, 2, 3, 5, 6, 6, 6, 8, 10, 12, 13, 14, 18, 18, 20, 22, 25, 29, 30, 30, 30, 30, 33, 33, 36, 38, 39, 41, 41, 42, 44, 45, 46, 48, 49, 49, 50, 53, 53, 55, 56, 57, 60, 62, 63, 64, 65, 65, 66, 67, 69, 71, 72, 73, 74, 75, 79, 80, 81, 82, 83, 85, 86, 86, 87, 87, 89, 89, 91, 92, 93, 94, 97, 97, 99, 99, 101, 103, 104, 108, 108, 109, 111, 112, 113, 116, 118, 118, 119, @@ -5853,9 +5853,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, //double q=0.678068387*pow(tt,1.5); double q=0.678068387*tt*sqrt(tt); - unsigned int vp; - unsigned int ini; - unsigned int ifin; + size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -5877,7 +5877,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, }else{ - for(unsigned int i=ini; i RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 0.76,0.76,0.76,0.77,0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.77,0.76,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.79,0.76,0.76,0.77,0.76,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.80,0.76,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.76,0.76,0.80,0.76,0.76,0.77,0.76,0.76, 0.76,0.76,0.76,0.76,0.77,0.76,0.76,0.76,0.76,0.76,0.76,0.76, 0.76,0.76,0.76,0.76,0.76,0.76,0.76,0.77,0.76,0.76,0.76,0.81, 0.76,0.76}; - + static const double brdO3air[518] ={ 2.3000,2.3498,2.5155,2.4060,2.3000,2.3000,2.3883,2.5895,2.3000, 2.5244,2.5392,2.3000,2.4682,2.7405,2.4771,2.3000,2.4149,2.3735, 2.4386,2.3942,2.3000,2.3000,2.3705,2.3000,2.5540,2.3000,2.6428, 2.3000,2.3000,2.3291,2.3000,2.4208,2.3735,2.4445,2.3000,2.3000, 2.3000,2.5540,2.3000,2.3000,2.3000,2.3000,2.4711,2.2610,2.2610, 2.3000,2.3291,2.2344,2.3000,2.3705,2.3000,2.2078,2.4978,2.4771, @@ -6033,8 +6033,8 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 2.1130,2.3000,2.3000,2.3498,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.5244,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000, 2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.3000,2.4415,2.3000, 2.3000,2.3000,2.0953,2.3000,2.3000}; - - static const unsigned int ifin1[500]={ + + static const size_t ifin1[500]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 9, 9, 9, 11, 11, 12, 12, 13, 14, 14, 14, 15, 15, 17, 17, 18, 18, 18, 18, 20, 21, 21, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 27, 28, 29, 30, 31, 31, 32, 32, 32, 33, 33, 33, 33, @@ -6053,7 +6053,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 439, 440, 441, 443, 443, 443, 443, 446, 447, 448, 449, 449, 450, 452, 456, 458, 458, 458, 458, 459, 460, 460, 460, 460, 461, 466, 469, 470, 474, 476, 476, 478, 480, 481, 482, 484, 487, 491, 494, 503, 515, 516, 516, 516, 516, 517, 517, 518, 518, 518}; - static const unsigned int ini1[500]={ + static const size_t ini1[500]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 9, 9, 9, 11, 11, 12, 12, 13, 14, 14, 14, 15, 15, 17, 17, 18, 18, 18, 18, 20, 21, 21, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 27, 28, 29, 30, 31, 31, 32, 32, 32, @@ -6072,7 +6072,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 434, 436, 436, 436, 439, 440, 441, 443, 443, 443, 443, 446, 447, 448, 449, 449, 450, 452, 456, 458, 458, 458, 458, 459, 460, 460, 460, 460, 461, 466, 469, 470, 474, 476, 476, 478, 480, 481, 482, 484, 487, 491, 494, 503, 515, 516, 516, 516, 516, 517}; - static const unsigned int ifin2[500]={ + static const size_t ifin2[500]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 9, 9, 9, 11, 11, 12, 12, 13, 14, 14, 14, 15, 15, 17, 17, 18, 18, 18, 18, 20, 21, 21, 22, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 26, 28, 29, 30, 31, 31, 32, 32, 32, 33, 33, 33, @@ -6091,7 +6091,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 436, 438, 440, 441, 443, 443, 443, 443, 444, 447, 448, 448, 449, 449, 451, 455, 457, 458, 458, 458, 459, 460, 460, 460, 460, 461, 466, 468, 469, 473, 476, 476, 478, 479, 481, 482, 484, 487, 490, 493, 500, 514, 516, 516, 516, 516, 517, 517, 518, 518}; - static const unsigned int ini2[500]={ + static const size_t ini2[500]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 6, 6, 7, 8, 9, 9, 9, 11, 11, 12, 12, 14, 14, 14, 14, 15, 17, 17, 18, 18, 18, 18, 19, 20, 21, 21, 23, 23, 24, 24, 24, 25, 25, 25, 25, 25, 26, 27, 28, 29, 31, 31, 32, 32, 32, 32, 33, @@ -6110,7 +6110,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 436, 436, 437, 439, 440, 443, 443, 443, 443, 444, 446, 448, 448, 449, 449, 451, 453, 457, 458, 458, 458, 458, 459, 460, 460, 460, 460, 465, 466, 469, 471, 474, 476, 477, 478, 480, 482, 482, 484, 487, 492, 495, 506, 515, 516, 516, 516, 516, 517, 517}; - static const unsigned int ifin3[500]={ + static const size_t ifin3[500]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 6, 6, 7, 8, 9, 9, 9, 11, 11, 12, 12, 14, 14, 14, 14, 15, 17, 17, 18, 18, 18, 18, 19, 20, 21, 21, 23, 23, 24, 24, 24, 25, 25, 25, 25, 25, 26, 27, 28, 29, 31, 31, 32, 32, 32, 32, 33, 33, @@ -6129,7 +6129,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, 436, 437, 439, 440, 443, 443, 443, 443, 444, 446, 448, 448, 449, 449, 451, 453, 457, 458, 458, 458, 458, 459, 460, 460, 460, 460, 465, 466, 469, 471, 474, 476, 477, 478, 480, 482, 482, 484, 487, 492, 495, 506, 515, 516, 516, 516, 516, 517, 517, 518}; - static const unsigned int ini3[500]={ + static const size_t ini3[500]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 9, 9, 9, 11, 11, 12, 12, 13, 14, 14, 14, 15, 15, 17, 17, 18, 18, 18, 18, 20, 21, 21, 22, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 26, 28, 29, 30, 31, 31, 32, 32, 32, 33, 33, @@ -6155,9 +6155,9 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, //double q=0.664313224*pow(tt,1.5); double q=0.664313224*tt*sqrt(tt); - unsigned int vp; - unsigned int ini; - unsigned int ifin; + size_t vp; + size_t ini; + size_t ifin; std::complex lshape; std::complex lshapeacum; @@ -6179,7 +6179,7 @@ std::complex RefractiveIndex::mkSpecificRefractivity_16o18o(double tt, }else{ - for(unsigned int i=ini; i= refalti.get("km")) { ires=i; fractionLast = (refalti.get("m")-alti.get("m"))/v_layerThickness_[i]; } alti = alti + Length(v_layerThickness_[i],"m"); @@ -549,16 +549,16 @@ Opacity RefractiveIndexProfile::getDryOpacityUpTo(unsigned int nc, Length refalt numLayer_ = ires; opacityout0=getDryOpacity(nc); numLayer_ = ires+1; - opacityout1=getDryOpacity(nc); + opacityout1=getDryOpacity(nc); numLayer_ = numlayerold; return opacityout0+(opacityout1-opacityout0)*fractionLast; } } -Opacity RefractiveIndexProfile::getDryOpacity(unsigned int nc) +Opacity RefractiveIndexProfile::getDryOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_O2LinesPtr_[nc]->at(j) + vv_N_DryContPtr_[nc]->at(j) + vv_N_O3LinesPtr_[nc]->at(j) + vv_N_COLinesPtr_[nc]->at(j) + vv_N_N2OLinesPtr_[nc]->at(j) + vv_N_NO2LinesPtr_[nc]->at(j) @@ -568,36 +568,36 @@ Opacity RefractiveIndexProfile::getDryOpacity(unsigned int nc) } -Opacity RefractiveIndexProfile::getAverageDryOpacity(unsigned int spwid) +Opacity RefractiveIndexProfile::getAverageDryOpacity(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getDryOpacity(spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); return totalaverage; } -Opacity RefractiveIndexProfile::getAverageO2LinesOpacity(unsigned int spwid) +Opacity RefractiveIndexProfile::getAverageO2LinesOpacity(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getO2LinesOpacity(spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); return totalaverage; } -Opacity RefractiveIndexProfile::getAverageO3LinesOpacity(unsigned int spwid) +Opacity RefractiveIndexProfile::getAverageO3LinesOpacity(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { /* std::cout << " Freq = " << getChanFreq(spwid,nc).get("GHz") << " O3 opacity = " << getO3LinesOpacity(spwid,nc).get("np") << " O3 pathlength = " << getO3LinesPathLength(spwid,nc).get("microns") @@ -610,36 +610,36 @@ Opacity RefractiveIndexProfile::getAverageO3LinesOpacity(unsigned int spwid) return totalaverage; } -Opacity RefractiveIndexProfile::getAverageN2OLinesOpacity(unsigned int spwid) +Opacity RefractiveIndexProfile::getAverageN2OLinesOpacity(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getN2OLinesOpacity(spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); return totalaverage; } -Opacity RefractiveIndexProfile::getAverageNO2LinesOpacity(unsigned int spwid) +Opacity RefractiveIndexProfile::getAverageNO2LinesOpacity(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getNO2LinesOpacity(spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); return totalaverage; } -Opacity RefractiveIndexProfile::getAverageSO2LinesOpacity(unsigned int spwid) +Opacity RefractiveIndexProfile::getAverageSO2LinesOpacity(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getSO2LinesOpacity(spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); @@ -649,24 +649,24 @@ Opacity RefractiveIndexProfile::getAverageSO2LinesOpacity(unsigned int spwid) -Opacity RefractiveIndexProfile::getAverageCOLinesOpacity(unsigned int spwid) +Opacity RefractiveIndexProfile::getAverageCOLinesOpacity(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getCOLinesOpacity(spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); return totalaverage; } -Opacity RefractiveIndexProfile::getAverageDryContOpacity(unsigned int spwid) +Opacity RefractiveIndexProfile::getAverageDryContOpacity(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getDryContOpacity(spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); @@ -678,18 +678,18 @@ Opacity RefractiveIndexProfile::getDryContOpacity() return getDryContOpacity(0); } -Opacity RefractiveIndexProfile::getDryContOpacity(unsigned int nc) +Opacity RefractiveIndexProfile::getDryContOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_DryContPtr_[nc]->at(j)) * v_layerThickness_[j]; } return Opacity(kv); } -Opacity RefractiveIndexProfile::getDryContOpacity(unsigned int spwid, - unsigned int nc) +Opacity RefractiveIndexProfile::getDryContOpacity(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getDryContOpacity(v_transfertId_[spwid] + nc); @@ -700,18 +700,18 @@ Opacity RefractiveIndexProfile::getO2LinesOpacity() return getO2LinesOpacity(0); } -Opacity RefractiveIndexProfile::getO2LinesOpacity(unsigned int nc) +Opacity RefractiveIndexProfile::getO2LinesOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_O2LinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } return Opacity(kv); } -Opacity RefractiveIndexProfile::getO2LinesOpacity(unsigned int spwid, - unsigned int nc) +Opacity RefractiveIndexProfile::getO2LinesOpacity(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getO2LinesOpacity(v_transfertId_[spwid] + nc); @@ -722,18 +722,18 @@ Opacity RefractiveIndexProfile::getCOLinesOpacity() return getCOLinesOpacity(0); } -Opacity RefractiveIndexProfile::getCOLinesOpacity(unsigned int nc) +Opacity RefractiveIndexProfile::getCOLinesOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_COLinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } return Opacity(kv); } -Opacity RefractiveIndexProfile::getCOLinesOpacity(unsigned int spwid, - unsigned int nc) +Opacity RefractiveIndexProfile::getCOLinesOpacity(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getCOLinesOpacity(v_transfertId_[spwid] + nc); @@ -754,53 +754,53 @@ Opacity RefractiveIndexProfile::getSO2LinesOpacity() return getSO2LinesOpacity(0); } -Opacity RefractiveIndexProfile::getN2OLinesOpacity(unsigned int nc) +Opacity RefractiveIndexProfile::getN2OLinesOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_N2OLinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } return Opacity(kv); } -Opacity RefractiveIndexProfile::getN2OLinesOpacity(unsigned int spwid, - unsigned int nc) +Opacity RefractiveIndexProfile::getN2OLinesOpacity(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getN2OLinesOpacity(v_transfertId_[spwid] + nc); } -Opacity RefractiveIndexProfile::getNO2LinesOpacity(unsigned int nc) +Opacity RefractiveIndexProfile::getNO2LinesOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_NO2LinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } return Opacity(kv); } -Opacity RefractiveIndexProfile::getNO2LinesOpacity(unsigned int spwid, - unsigned int nc) +Opacity RefractiveIndexProfile::getNO2LinesOpacity(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getNO2LinesOpacity(v_transfertId_[spwid] + nc); } -Opacity RefractiveIndexProfile::getSO2LinesOpacity(unsigned int nc) +Opacity RefractiveIndexProfile::getSO2LinesOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_SO2LinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } return Opacity(kv); } -Opacity RefractiveIndexProfile::getSO2LinesOpacity(unsigned int spwid, - unsigned int nc) +Opacity RefractiveIndexProfile::getSO2LinesOpacity(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getSO2LinesOpacity(v_transfertId_[spwid] + nc); @@ -812,18 +812,18 @@ Opacity RefractiveIndexProfile::getO3LinesOpacity() return getO3LinesOpacity(0); } -Opacity RefractiveIndexProfile::getO3LinesOpacity(unsigned int nc) +Opacity RefractiveIndexProfile::getO3LinesOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_O3LinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } return Opacity(kv); } -Opacity RefractiveIndexProfile::getO3LinesOpacity(unsigned int spwid, - unsigned int nc) +Opacity RefractiveIndexProfile::getO3LinesOpacity(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getO3LinesOpacity(v_transfertId_[spwid] + nc); @@ -841,12 +841,12 @@ Opacity RefractiveIndexProfile::getWetOpacity(const Length &integratedwatercolum } Opacity RefractiveIndexProfile::getWetOpacity(const Length &integratedwatercolumn, - unsigned int nc) + size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; /* std::cout<<"nc="<at(j) + vv_N_H2OContPtr_[nc]->at(j)) * v_layerThickness_[j]; @@ -855,20 +855,20 @@ Opacity RefractiveIndexProfile::getWetOpacity(const Length &integratedwatercolum } Opacity RefractiveIndexProfile::getWetOpacity(const Length & integratedwatercolumn, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getWetOpacity(integratedwatercolumn,v_transfertId_[spwid] + nc); } Opacity RefractiveIndexProfile::getAverageWetOpacity(const Length &integratedwatercolumn, - unsigned int spwid) + size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getWetOpacity(integratedwatercolumn, spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); @@ -881,11 +881,11 @@ Opacity RefractiveIndexProfile::getH2OLinesOpacity(const Length &integratedwater } Opacity RefractiveIndexProfile::getH2OLinesOpacity(const Length &integratedwatercolumn, - unsigned int nc) + size_t nc) { if(!chanIndexIsValid(nc)) return Opacity(-999.0); double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { /* std::cout <<"j="<at(j)) * v_layerThickness_[j]; } return Opacity(kv*(integratedwatercolumn.get()/getGroundWH2O().get())); @@ -933,8 +933,8 @@ Opacity RefractiveIndexProfile::getH2OContOpacity(const Length &integratedwaterc Opacity RefractiveIndexProfile::getH2OContOpacity(const Length &integratedwatercolumn, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return Opacity(-999.0); return getH2OContOpacity(integratedwatercolumn,v_transfertId_[spwid] + nc); @@ -943,12 +943,12 @@ Opacity RefractiveIndexProfile::getH2OContOpacity(const Length &integratedwaterc Opacity RefractiveIndexProfile::getAverageH2OContOpacity(const Length &integratedwatercolumn, - unsigned int spwid) + size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) return Opacity(-999.0); Opacity totalaverage; totalaverage = Opacity(0.0, "np"); - for(unsigned int nc = 0; nc < getNumChan(spwid); nc++) { + for(size_t nc = 0; nc < getNumChan(spwid); nc++) { totalaverage = totalaverage + getH2OContOpacity(integratedwatercolumn,spwid, nc); } totalaverage = totalaverage / getNumChan(spwid); @@ -966,13 +966,13 @@ Length RefractiveIndexProfile::getDispersiveH2OPathLength(const Length &integrat } Angle RefractiveIndexProfile::getDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, - unsigned int nc) + size_t nc) { if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); } double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_H2OLinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(kv*(integratedwatercolumn.get()/getGroundWH2O().get())* 57.29578, "deg"); @@ -980,7 +980,7 @@ Angle RefractiveIndexProfile::getDispersiveH2OPhaseDelay(const Length &integrate } Length RefractiveIndexProfile::getDispersiveH2OPathLength(const Length &integratedwatercolumn, - unsigned int nc) + size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -992,8 +992,8 @@ Length RefractiveIndexProfile::getDispersiveH2OPathLength(const Length &integrat } Angle RefractiveIndexProfile::getDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1002,13 +1002,13 @@ Angle RefractiveIndexProfile::getDispersiveH2OPhaseDelay(const Length &integrate } Angle RefractiveIndexProfile::getAverageDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, - unsigned int spwid) + size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getDispersiveH2OPhaseDelay(integratedwatercolumn,v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -1017,8 +1017,8 @@ Angle RefractiveIndexProfile::getAverageDispersiveH2OPhaseDelay(const Length &in } Length RefractiveIndexProfile::getDispersiveH2OPathLength(const Length &integratedwatercolumn, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1027,13 +1027,13 @@ Length RefractiveIndexProfile::getDispersiveH2OPathLength(const Length &integrat } Length RefractiveIndexProfile::getAverageDispersiveH2OPathLength(const Length &integratedwatercolumn, - unsigned int spwid) + size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getDispersiveH2OPathLength(integratedwatercolumn,v_transfertId_[spwid] + i).get("mm"); } av = av / getNumChan(spwid); @@ -1061,20 +1061,20 @@ Length RefractiveIndexProfile::getDispersiveDryPathLength() return getDispersiveDryPathLength(0); } -Angle RefractiveIndexProfile::getNonDispersiveDryPhaseDelay(unsigned int nc) +Angle RefractiveIndexProfile::getNonDispersiveDryPhaseDelay(size_t nc) { if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); } double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_DryContPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(kv * 57.29578, "deg"); return aa; } -Angle RefractiveIndexProfile::getDispersiveDryPhaseDelay(unsigned int nc) +Angle RefractiveIndexProfile::getDispersiveDryPhaseDelay(size_t nc) { // std::cout << "getO2LinesPhaseDelay(" << nc << ")=" << getO2LinesPhaseDelay(nc).get("deg") << std::endl; // std::cout << "getO3LinesPhaseDelay(" << nc << ")=" << getO3LinesPhaseDelay(nc).get("deg") << std::endl; @@ -1087,7 +1087,7 @@ Angle RefractiveIndexProfile::getDispersiveDryPhaseDelay(unsigned int nc) + getNO2LinesPhaseDelay(nc) + getSO2LinesPhaseDelay(nc); } -Length RefractiveIndexProfile::getNonDispersiveDryPathLength(unsigned int nc) +Length RefractiveIndexProfile::getNonDispersiveDryPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1099,8 +1099,8 @@ Length RefractiveIndexProfile::getNonDispersiveDryPathLength(unsigned int nc) return ll; } -Angle RefractiveIndexProfile::getNonDispersiveDryPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle RefractiveIndexProfile::getNonDispersiveDryPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1108,7 +1108,7 @@ Angle RefractiveIndexProfile::getNonDispersiveDryPhaseDelay(unsigned int spwid, return getNonDispersiveDryPhaseDelay(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getDispersiveDryPathLength(unsigned int nc) +Length RefractiveIndexProfile::getDispersiveDryPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1119,8 +1119,8 @@ Length RefractiveIndexProfile::getDispersiveDryPathLength(unsigned int nc) return ll; } -Angle RefractiveIndexProfile::getDispersiveDryPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle RefractiveIndexProfile::getDispersiveDryPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1128,13 +1128,13 @@ Angle RefractiveIndexProfile::getDispersiveDryPhaseDelay(unsigned int spwid, return getDispersiveDryPhaseDelay(v_transfertId_[spwid] + nc); } -Angle RefractiveIndexProfile::getAverageNonDispersiveDryPhaseDelay(unsigned int spwid) +Angle RefractiveIndexProfile::getAverageNonDispersiveDryPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getNonDispersiveDryPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } @@ -1143,13 +1143,13 @@ Angle RefractiveIndexProfile::getAverageNonDispersiveDryPhaseDelay(unsigned int return average; } -Angle RefractiveIndexProfile::getAverageDispersiveDryPhaseDelay(unsigned int spwid) +Angle RefractiveIndexProfile::getAverageDispersiveDryPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getDispersiveDryPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -1157,8 +1157,8 @@ Angle RefractiveIndexProfile::getAverageDispersiveDryPhaseDelay(unsigned int spw return average; } -Length RefractiveIndexProfile::getNonDispersiveDryPathLength(unsigned int spwid, - unsigned int nc) +Length RefractiveIndexProfile::getNonDispersiveDryPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1166,8 +1166,8 @@ Length RefractiveIndexProfile::getNonDispersiveDryPathLength(unsigned int spwid, return getNonDispersiveDryPathLength(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getDispersiveDryPathLength(unsigned int spwid, - unsigned int nc) +Length RefractiveIndexProfile::getDispersiveDryPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1175,13 +1175,13 @@ Length RefractiveIndexProfile::getDispersiveDryPathLength(unsigned int spwid, return getDispersiveDryPathLength(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getAverageNonDispersiveDryPathLength(unsigned int spwid) +Length RefractiveIndexProfile::getAverageNonDispersiveDryPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getNonDispersiveDryPathLength(v_transfertId_[spwid] + i).get("mm"); } @@ -1190,13 +1190,13 @@ Length RefractiveIndexProfile::getAverageNonDispersiveDryPathLength(unsigned int return average; } -Length RefractiveIndexProfile::getAverageDispersiveDryPathLength(unsigned int spwid) +Length RefractiveIndexProfile::getAverageDispersiveDryPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getDispersiveDryPathLength(v_transfertId_[spwid] + i).get("mm"); } @@ -1215,20 +1215,20 @@ Length RefractiveIndexProfile::getO2LinesPathLength() return getO2LinesPathLength(0); } -Angle RefractiveIndexProfile::getO2LinesPhaseDelay(unsigned int nc) +Angle RefractiveIndexProfile::getO2LinesPhaseDelay(size_t nc) { if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); } double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_O2LinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(kv * 57.29578, "deg"); return aa; } -Length RefractiveIndexProfile::getO2LinesPathLength(unsigned int nc) +Length RefractiveIndexProfile::getO2LinesPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1238,8 +1238,8 @@ Length RefractiveIndexProfile::getO2LinesPathLength(unsigned int nc) return ll; } -Angle RefractiveIndexProfile::getO2LinesPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle RefractiveIndexProfile::getO2LinesPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1247,13 +1247,13 @@ Angle RefractiveIndexProfile::getO2LinesPhaseDelay(unsigned int spwid, return getO2LinesPhaseDelay(v_transfertId_[spwid] + nc); } -Angle RefractiveIndexProfile::getAverageO2LinesPhaseDelay(unsigned int spwid) +Angle RefractiveIndexProfile::getAverageO2LinesPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getO2LinesPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -1261,8 +1261,8 @@ Angle RefractiveIndexProfile::getAverageO2LinesPhaseDelay(unsigned int spwid) return average; } -Length RefractiveIndexProfile::getO2LinesPathLength(unsigned int spwid, - unsigned int nc) +Length RefractiveIndexProfile::getO2LinesPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1270,13 +1270,13 @@ Length RefractiveIndexProfile::getO2LinesPathLength(unsigned int spwid, return getO2LinesPathLength(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getAverageO2LinesPathLength(unsigned int spwid) +Length RefractiveIndexProfile::getAverageO2LinesPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getO2LinesPathLength(v_transfertId_[spwid] + i).get("mm"); } av = av / getNumChan(spwid); @@ -1294,7 +1294,7 @@ Length RefractiveIndexProfile::getO3LinesPathLength() return getO3LinesPathLength(0); } -Angle RefractiveIndexProfile::getO3LinesPhaseDelay(unsigned int nc) +Angle RefractiveIndexProfile::getO3LinesPhaseDelay(size_t nc) { if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); @@ -1303,7 +1303,7 @@ Angle RefractiveIndexProfile::getO3LinesPhaseDelay(unsigned int nc) // if(nc=66){cout << "vv_N_O3LinesPtr_" << ".size()=" << vv_N_O3LinesPtr_.size() << std::endl;} - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { /* if(nc=66){ std::cout << "j=" << j << " vv_N_O3LinesPtr_[" << nc << "]->at(" << j << ")=" << vv_N_O3LinesPtr_[nc]->at(j) << std::endl; } */ @@ -1313,7 +1313,7 @@ Angle RefractiveIndexProfile::getO3LinesPhaseDelay(unsigned int nc) return aa; } -Length RefractiveIndexProfile::getO3LinesPathLength(unsigned int nc) +Length RefractiveIndexProfile::getO3LinesPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1323,8 +1323,8 @@ Length RefractiveIndexProfile::getO3LinesPathLength(unsigned int nc) return ll; } -Angle RefractiveIndexProfile::getO3LinesPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle RefractiveIndexProfile::getO3LinesPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1332,13 +1332,13 @@ Angle RefractiveIndexProfile::getO3LinesPhaseDelay(unsigned int spwid, return getO3LinesPhaseDelay(v_transfertId_[spwid] + nc); } -Angle RefractiveIndexProfile::getAverageO3LinesPhaseDelay(unsigned int spwid) +Angle RefractiveIndexProfile::getAverageO3LinesPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getO3LinesPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -1346,8 +1346,8 @@ Angle RefractiveIndexProfile::getAverageO3LinesPhaseDelay(unsigned int spwid) return average; } -Length RefractiveIndexProfile::getO3LinesPathLength(unsigned int spwid, - unsigned int nc) +Length RefractiveIndexProfile::getO3LinesPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1355,13 +1355,13 @@ Length RefractiveIndexProfile::getO3LinesPathLength(unsigned int spwid, return getO3LinesPathLength(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getAverageO3LinesPathLength(unsigned int spwid) +Length RefractiveIndexProfile::getAverageO3LinesPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getO3LinesPathLength(v_transfertId_[spwid] + i).get("mm"); } av = av / getNumChan(spwid); @@ -1379,20 +1379,20 @@ Length RefractiveIndexProfile::getCOLinesPathLength() return getCOLinesPathLength(0); } -Angle RefractiveIndexProfile::getCOLinesPhaseDelay(unsigned int nc) +Angle RefractiveIndexProfile::getCOLinesPhaseDelay(size_t nc) { if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); } double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_COLinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(kv * 57.29578, "deg"); return aa; } -Length RefractiveIndexProfile::getCOLinesPathLength(unsigned int nc) +Length RefractiveIndexProfile::getCOLinesPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1402,8 +1402,8 @@ Length RefractiveIndexProfile::getCOLinesPathLength(unsigned int nc) return ll; } -Angle RefractiveIndexProfile::getCOLinesPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle RefractiveIndexProfile::getCOLinesPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1411,13 +1411,13 @@ Angle RefractiveIndexProfile::getCOLinesPhaseDelay(unsigned int spwid, return getCOLinesPhaseDelay(v_transfertId_[spwid] + nc); } -Angle RefractiveIndexProfile::getAverageCOLinesPhaseDelay(unsigned int spwid) +Angle RefractiveIndexProfile::getAverageCOLinesPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getCOLinesPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -1425,8 +1425,8 @@ Angle RefractiveIndexProfile::getAverageCOLinesPhaseDelay(unsigned int spwid) return average; } -Length RefractiveIndexProfile::getCOLinesPathLength(unsigned int spwid, - unsigned int nc) +Length RefractiveIndexProfile::getCOLinesPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1434,13 +1434,13 @@ Length RefractiveIndexProfile::getCOLinesPathLength(unsigned int spwid, return getCOLinesPathLength(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getAverageCOLinesPathLength(unsigned int spwid) +Length RefractiveIndexProfile::getAverageCOLinesPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getCOLinesPathLength(v_transfertId_[spwid] + i).get("mm"); } av = av / getNumChan(spwid); @@ -1458,20 +1458,20 @@ Length RefractiveIndexProfile::getN2OLinesPathLength() return getN2OLinesPathLength(0); } -Angle RefractiveIndexProfile::getN2OLinesPhaseDelay(unsigned int nc) +Angle RefractiveIndexProfile::getN2OLinesPhaseDelay(size_t nc) { if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); } double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_N2OLinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(kv * 57.29578, "deg"); return aa; } -Length RefractiveIndexProfile::getN2OLinesPathLength(unsigned int nc) +Length RefractiveIndexProfile::getN2OLinesPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1481,8 +1481,8 @@ Length RefractiveIndexProfile::getN2OLinesPathLength(unsigned int nc) return ll; } -Angle RefractiveIndexProfile::getN2OLinesPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle RefractiveIndexProfile::getN2OLinesPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1490,13 +1490,13 @@ Angle RefractiveIndexProfile::getN2OLinesPhaseDelay(unsigned int spwid, return getN2OLinesPhaseDelay(v_transfertId_[spwid] + nc); } -Angle RefractiveIndexProfile::getAverageN2OLinesPhaseDelay(unsigned int spwid) +Angle RefractiveIndexProfile::getAverageN2OLinesPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getN2OLinesPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -1504,8 +1504,8 @@ Angle RefractiveIndexProfile::getAverageN2OLinesPhaseDelay(unsigned int spwid) return average; } -Length RefractiveIndexProfile::getN2OLinesPathLength(unsigned int spwid, - unsigned int nc) +Length RefractiveIndexProfile::getN2OLinesPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1513,13 +1513,13 @@ Length RefractiveIndexProfile::getN2OLinesPathLength(unsigned int spwid, return getN2OLinesPathLength(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getAverageN2OLinesPathLength(unsigned int spwid) +Length RefractiveIndexProfile::getAverageN2OLinesPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getN2OLinesPathLength(v_transfertId_[spwid] + i).get("mm"); } av = av / getNumChan(spwid); @@ -1542,20 +1542,20 @@ Length RefractiveIndexProfile::getNO2LinesPathLength() return getNO2LinesPathLength(0); } -Angle RefractiveIndexProfile::getNO2LinesPhaseDelay(unsigned int nc) +Angle RefractiveIndexProfile::getNO2LinesPhaseDelay(size_t nc) { if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); } double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_NO2LinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(kv * 57.29578, "deg"); return aa; } -Length RefractiveIndexProfile::getNO2LinesPathLength(unsigned int nc) +Length RefractiveIndexProfile::getNO2LinesPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1565,8 +1565,8 @@ Length RefractiveIndexProfile::getNO2LinesPathLength(unsigned int nc) return ll; } -Angle RefractiveIndexProfile::getNO2LinesPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle RefractiveIndexProfile::getNO2LinesPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1574,13 +1574,13 @@ Angle RefractiveIndexProfile::getNO2LinesPhaseDelay(unsigned int spwid, return getNO2LinesPhaseDelay(v_transfertId_[spwid] + nc); } -Angle RefractiveIndexProfile::getAverageNO2LinesPhaseDelay(unsigned int spwid) +Angle RefractiveIndexProfile::getAverageNO2LinesPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getNO2LinesPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -1588,8 +1588,8 @@ Angle RefractiveIndexProfile::getAverageNO2LinesPhaseDelay(unsigned int spwid) return average; } -Length RefractiveIndexProfile::getNO2LinesPathLength(unsigned int spwid, - unsigned int nc) +Length RefractiveIndexProfile::getNO2LinesPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1597,13 +1597,13 @@ Length RefractiveIndexProfile::getNO2LinesPathLength(unsigned int spwid, return getNO2LinesPathLength(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getAverageNO2LinesPathLength(unsigned int spwid) +Length RefractiveIndexProfile::getAverageNO2LinesPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getNO2LinesPathLength(v_transfertId_[spwid] + i).get("mm"); } av = av / getNumChan(spwid); @@ -1628,20 +1628,20 @@ Length RefractiveIndexProfile::getSO2LinesPathLength() return getSO2LinesPathLength(0); } -Angle RefractiveIndexProfile::getSO2LinesPhaseDelay(unsigned int nc) +Angle RefractiveIndexProfile::getSO2LinesPhaseDelay(size_t nc) { if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); } double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_SO2LinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(kv * 57.29578, "deg"); return aa; } -Length RefractiveIndexProfile::getSO2LinesPathLength(unsigned int nc) +Length RefractiveIndexProfile::getSO2LinesPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1651,8 +1651,8 @@ Length RefractiveIndexProfile::getSO2LinesPathLength(unsigned int nc) return ll; } -Angle RefractiveIndexProfile::getSO2LinesPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle RefractiveIndexProfile::getSO2LinesPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1660,13 +1660,13 @@ Angle RefractiveIndexProfile::getSO2LinesPhaseDelay(unsigned int spwid, return getSO2LinesPhaseDelay(v_transfertId_[spwid] + nc); } -Angle RefractiveIndexProfile::getAverageSO2LinesPhaseDelay(unsigned int spwid) +Angle RefractiveIndexProfile::getAverageSO2LinesPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getSO2LinesPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -1674,8 +1674,8 @@ Angle RefractiveIndexProfile::getAverageSO2LinesPhaseDelay(unsigned int spwid) return average; } -Length RefractiveIndexProfile::getSO2LinesPathLength(unsigned int spwid, - unsigned int nc) +Length RefractiveIndexProfile::getSO2LinesPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0, "m"); @@ -1683,13 +1683,13 @@ Length RefractiveIndexProfile::getSO2LinesPathLength(unsigned int spwid, return getSO2LinesPathLength(v_transfertId_[spwid] + nc); } -Length RefractiveIndexProfile::getAverageSO2LinesPathLength(unsigned int spwid) +Length RefractiveIndexProfile::getAverageSO2LinesPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0, "m"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getSO2LinesPathLength(v_transfertId_[spwid] + i).get("mm"); } av = av / getNumChan(spwid); @@ -1709,13 +1709,13 @@ Length RefractiveIndexProfile::getNonDispersiveH2OPathLength(const Length &integ } Angle RefractiveIndexProfile::getNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, - unsigned int nc) + size_t nc) { double kv = 0; if(!chanIndexIsValid(nc)) { return Angle(-999.0, "deg"); } - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_H2OContPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(kv*(integratedwatercolumn.get()/getGroundWH2O().get())* 57.29578, "deg"); @@ -1723,7 +1723,7 @@ Angle RefractiveIndexProfile::getNonDispersiveH2OPhaseDelay(const Length &integr } Length RefractiveIndexProfile::getNonDispersiveH2OPathLength(const Length &integratedwatercolumn, - unsigned int nc) + size_t nc) { if(!chanIndexIsValid(nc)) { return Length(-999.0, "m"); @@ -1734,8 +1734,8 @@ Length RefractiveIndexProfile::getNonDispersiveH2OPathLength(const Length &integ } Angle RefractiveIndexProfile::getNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Angle(-999.0, "deg"); @@ -1744,13 +1744,13 @@ Angle RefractiveIndexProfile::getNonDispersiveH2OPhaseDelay(const Length &integr } Angle RefractiveIndexProfile::getAverageNonDispersiveH2OPhaseDelay(const Length &integratedwatercolumn, - unsigned int spwid) + size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Angle(-999.0, "deg"); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getNonDispersiveH2OPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } @@ -1760,8 +1760,8 @@ Angle RefractiveIndexProfile::getAverageNonDispersiveH2OPhaseDelay(const Length } Length RefractiveIndexProfile::getNonDispersiveH2OPathLength(const Length &integratedwatercolumn, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { return Length(-999.0); @@ -1770,13 +1770,13 @@ Length RefractiveIndexProfile::getNonDispersiveH2OPathLength(const Length &integ } Length RefractiveIndexProfile::getAverageNonDispersiveH2OPathLength(const Length &integratedwatercolumn, - unsigned int spwid) + size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { return Length(-999.0); } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getNonDispersiveH2OPathLength(integratedwatercolumn,v_transfertId_[spwid] + i).get("deg"); } @@ -1786,7 +1786,7 @@ Length RefractiveIndexProfile::getAverageNonDispersiveH2OPathLength(const Length } // NB: the function chanIndexIsValid will be overrided by .... -bool RefractiveIndexProfile::chanIndexIsValid(unsigned int nc) +bool RefractiveIndexProfile::chanIndexIsValid(size_t nc) { if(nc < vv_N_H2OLinesPtr_.size()) return true; if(nc < v_chanFreq_.size()) { @@ -1803,8 +1803,8 @@ bool RefractiveIndexProfile::chanIndexIsValid(unsigned int nc) } // NB: the function spwidAndIndexAreValid will be overrided by ... -bool RefractiveIndexProfile::spwidAndIndexAreValid(unsigned int spwid, - unsigned int idx) +bool RefractiveIndexProfile::spwidAndIndexAreValid(size_t spwid, + size_t idx) { if(spwid > getNumSpectralWindow() - 1) { @@ -1818,7 +1818,7 @@ bool RefractiveIndexProfile::spwidAndIndexAreValid(unsigned int spwid, << std::endl; return false; } - unsigned int nc = v_transfertId_[spwid] + idx; + size_t nc = v_transfertId_[spwid] + idx; bool valid = chanIndexIsValid(nc); return valid; } diff --git a/src/libaatm/src/ATMSkyStatus.cpp b/src/libaatm/src/ATMSkyStatus.cpp index e457061..1fa5200 100644 --- a/src/libaatm/src/ATMSkyStatus.cpp +++ b/src/libaatm/src/ATMSkyStatus.cpp @@ -212,7 +212,7 @@ SkyStatus::SkyStatus(const RefractiveIndexProfile &refractiveIndexProfile, SkyStatus::SkyStatus(const SkyStatus & a) : RefractiveIndexProfile(a) { - // 2015-03-02 (DB) : + // 2015-03-02 (DB) : // Use constructor of base class RefractiveIndexProfile() // and comment the following code because it is executed in RefractiveIndexProfile() constructor @@ -235,7 +235,7 @@ SkyStatus::SkyStatus(const SkyStatus & a) : RefractiveIndexProfile(a) // v_layerN2O_.reserve(numLayer_); // v_layerNO2_.reserve(numLayer_); // v_layerSO2_.reserve(numLayer_); -// for(unsigned int n = 0; n < numLayer_; n++) { +// for(size_t n = 0; n < numLayer_; n++) { // v_layerThickness_.push_back(a.v_layerThickness_[n]); // v_layerTemperature_.push_back(a.v_layerTemperature_[n]); // //v_layerDeltaT_.push_back(a.v_layerDeltaT_[n]); @@ -291,7 +291,7 @@ SkyStatus::SkyStatus(const SkyStatus & a) : RefractiveIndexProfile(a) // vector >* v_N_NO2LinesPtr; // vector >* v_N_SO2LinesPtr; -// for(unsigned int nc = 0; nc < v_chanFreq_.size(); nc++) { +// for(size_t nc = 0; nc < v_chanFreq_.size(); nc++) { // v_N_H2OLinesPtr = new vector > ; // v_N_H2OLinesPtr->reserve(numLayer_); @@ -312,7 +312,7 @@ SkyStatus::SkyStatus(const SkyStatus & a) : RefractiveIndexProfile(a) // v_N_SO2LinesPtr = new vector > ; // v_N_SO2LinesPtr->reserve(numLayer_); -// for(unsigned int n = 0; n < numLayer_; n++) { +// for(size_t n = 0; n < numLayer_; n++) { // // cout << "numLayer_=" << nc << " " << n << endl; // COMMENTED OUT BY JUAN MAY/16/2005 @@ -695,19 +695,19 @@ bool SkyStatus::updateProfilesAndRadiance(const Length &altitude, return updated; } -Opacity SkyStatus::getH2OLinesOpacity(unsigned int nc) +Opacity SkyStatus::getH2OLinesOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return (double) -999.0; double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_H2OLinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } return ((getUserWH2O().get()) / (getGroundWH2O().get())) * kv; } -Opacity SkyStatus::getH2OLinesOpacityUpTo(unsigned int nc, Length refalti) +Opacity SkyStatus::getH2OLinesOpacityUpTo(size_t nc, Length refalti) { - unsigned int ires; unsigned int numlayerold; Length alti; + size_t ires; size_t numlayerold; Length alti; Opacity opacityout0; Opacity opacityout1; Opacity zeroOp(0.0,"np"); double fractionLast; double g1; double g2; @@ -717,7 +717,7 @@ Opacity SkyStatus::getH2OLinesOpacityUpTo(unsigned int nc, Length refalti) fractionLast = 1.0; numlayerold = numLayer_; g1=getGroundWH2O().get(); opacityout0=getH2OLinesOpacity(nc); ires=numlayerold-1; alti=altitude_; - for(unsigned int i=0; i= refalti.get("km")) { ires=i; fractionLast = (refalti.get("m")-alti.get("m"))/v_layerThickness_[i]; } alti = alti + Length(v_layerThickness_[i],"m"); @@ -725,16 +725,16 @@ Opacity SkyStatus::getH2OLinesOpacityUpTo(unsigned int nc, Length refalti) numLayer_ = ires; g2=getGroundWH2O().get(); opacityout0=getH2OLinesOpacity(nc)*(g2/g1); numLayer_ = ires+1; g2=getGroundWH2O().get(); - opacityout1=getH2OLinesOpacity(nc)*(g2/g1); + opacityout1=getH2OLinesOpacity(nc)*(g2/g1); numLayer_ = numlayerold; return opacityout0+(opacityout1-opacityout0)*fractionLast; } } /* -Opacity SkyStatus::getTotalOpacityUpTo(unsigned int nc, Length refalti) //15NOV2017 +Opacity SkyStatus::getTotalOpacityUpTo(size_t nc, Length refalti) //15NOV2017 { - unsigned int ires; unsigned int numlayerold; Length alti; + size_t ires; size_t numlayerold; Length alti; Opacity opacityout; Opacity opacityout0; Opacity opacityout1; Opacity zeroOp(0.0,"np"); double fractionLast; double g1; double g2; @@ -744,7 +744,7 @@ Opacity SkyStatus::getTotalOpacityUpTo(unsigned int nc, Length refalti) //15N }else{ fractionLast = 1.0; numlayerold = numLayer_; g1=getGroundWH2O().get(); ires = numlayerold-1; alti=altitude_; - for(unsigned int i=0; i= refalti.get("km")) { ires=i; fractionLast = (refalti.get("m")-alti.get("m"))/v_layerThickness_[i]; } alti = alti + Length(v_layerThickness_[i],"m"); @@ -770,30 +770,30 @@ Opacity SkyStatus::getTotalOpacityUpTo(unsigned int nc, Length refalti) //15N } */ -Opacity SkyStatus::getH2OContOpacity(unsigned int nc) +Opacity SkyStatus::getH2OContOpacity(size_t nc) { if(!chanIndexIsValid(nc)) return (double) -999.0; double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + imag(vv_N_H2OContPtr_[nc]->at(j)) * v_layerThickness_[j]; } return ((getUserWH2O().get()) / (getGroundWH2O().get())) * kv; } -Opacity SkyStatus::getH2OContOpacityUpTo(unsigned int nc, Length refalti) +Opacity SkyStatus::getH2OContOpacityUpTo(size_t nc, Length refalti) { - unsigned int ires; unsigned int numlayerold; Length alti; + size_t ires; size_t numlayerold; Length alti; Opacity opacityout0; Opacity opacityout1; Opacity zeroOp(0.0,"np"); double fractionLast; double g1; double g2; - + if(refalti.get("km") <= altitude_.get("km")) { return zeroOp; }else{ fractionLast = 1.0; numlayerold = numLayer_; g1=getGroundWH2O().get(); opacityout0=getH2OContOpacity(nc); ires=numlayerold-1; alti=altitude_; - for(unsigned int i=0; i= refalti.get("km")) { ires=i; fractionLast = (refalti.get("m")-alti.get("m"))/v_layerThickness_[i]; } alti = alti + Length(v_layerThickness_[i],"m"); @@ -801,20 +801,20 @@ Opacity SkyStatus::getH2OContOpacityUpTo(unsigned int nc, Length refalti) numLayer_ = ires; g2=getGroundWH2O().get(); opacityout0=getH2OContOpacity(nc)*(g2/g1); numLayer_ = ires+1; g2=getGroundWH2O().get(); - opacityout1=getH2OContOpacity(nc)*(g2/g1); + opacityout1=getH2OContOpacity(nc)*(g2/g1); numLayer_ = numlayerold; return opacityout0+(opacityout1-opacityout0)*fractionLast; } } -Angle SkyStatus::getDispersiveH2OPhaseDelay(unsigned int nc) +Angle SkyStatus::getDispersiveH2OPhaseDelay(size_t nc) { if(!chanIndexIsValid(nc)) { Angle aa(0.0, "deg"); return aa; } double kv = 0; - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_H2OLinesPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(((getUserWH2O().get()) / (getGroundWH2O().get())) * kv * 57.29578, @@ -822,7 +822,7 @@ Angle SkyStatus::getDispersiveH2OPhaseDelay(unsigned int nc) return aa; } -Length SkyStatus::getDispersiveH2OPathLength(unsigned int nc) +Length SkyStatus::getDispersiveH2OPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { Length ll(0.0, "mm"); @@ -834,14 +834,14 @@ Length SkyStatus::getDispersiveH2OPathLength(unsigned int nc) return ll; } -Angle SkyStatus::getNonDispersiveH2OPhaseDelay(unsigned int nc) +Angle SkyStatus::getNonDispersiveH2OPhaseDelay(size_t nc) { double kv = 0; if(!chanIndexIsValid(nc)) { Angle aa(0.0, "deg"); return aa; } - for(unsigned int j = 0; j < numLayer_; j++) { + for(size_t j = 0; j < numLayer_; j++) { kv = kv + real(vv_N_H2OContPtr_[nc]->at(j)) * v_layerThickness_[j]; } Angle aa(((getUserWH2O().get()) / (getGroundWH2O().get())) * kv * 57.29578, @@ -849,7 +849,7 @@ Angle SkyStatus::getNonDispersiveH2OPhaseDelay(unsigned int nc) return aa; } -Length SkyStatus::getNonDispersiveH2OPathLength(unsigned int nc) +Length SkyStatus::getNonDispersiveH2OPathLength(size_t nc) { if(!chanIndexIsValid(nc)) { Length ll(0.0, "mm"); @@ -862,14 +862,14 @@ Length SkyStatus::getNonDispersiveH2OPathLength(unsigned int nc) return ll; } -Angle SkyStatus::getAverageDispersiveH2OPhaseDelay(unsigned int spwid) +Angle SkyStatus::getAverageDispersiveH2OPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { Angle aa(-999.0, "deg"); return aa; } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getDispersiveH2OPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } av = av / getNumChan(spwid); @@ -877,14 +877,14 @@ Angle SkyStatus::getAverageDispersiveH2OPhaseDelay(unsigned int spwid) return average; } -Length SkyStatus::getAverageDispersiveH2OPathLength(unsigned int spwid) +Length SkyStatus::getAverageDispersiveH2OPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { Length ll(0.0, "mm"); return ll; } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getDispersiveH2OPathLength(v_transfertId_[spwid] + i).get("mm"); } av = av / getNumChan(spwid); @@ -892,14 +892,14 @@ Length SkyStatus::getAverageDispersiveH2OPathLength(unsigned int spwid) return average; } -Angle SkyStatus::getAverageNonDispersiveH2OPhaseDelay(unsigned int spwid) +Angle SkyStatus::getAverageNonDispersiveH2OPhaseDelay(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { Angle aa(0.0, "deg"); return aa; } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getNonDispersiveH2OPhaseDelay(v_transfertId_[spwid] + i).get("deg"); } @@ -908,14 +908,14 @@ Angle SkyStatus::getAverageNonDispersiveH2OPhaseDelay(unsigned int spwid) return average; } -Length SkyStatus::getAverageNonDispersiveH2OPathLength(unsigned int spwid) +Length SkyStatus::getAverageNonDispersiveH2OPathLength(size_t spwid) { if(!spwidAndIndexAreValid(spwid, 0)) { Length ll(0.0, "mm"); return ll; } double av = 0.0; - for(unsigned int i = 0; i < getNumChan(spwid); i++) { + for(size_t i = 0; i < getNumChan(spwid); i++) { av = av + getNonDispersiveH2OPathLength(v_transfertId_[spwid] + i).get("mm"); } @@ -924,7 +924,7 @@ Length SkyStatus::getAverageNonDispersiveH2OPathLength(unsigned int spwid) return average; } -Temperature SkyStatus::getAverageTebbSky(unsigned int spwid, +Temperature SkyStatus::getAverageTebbSky(size_t spwid, const Length &wh2o, double airmass, double skycoupling, @@ -951,7 +951,7 @@ Temperature SkyStatus::getAverageTebbSky(unsigned int spwid, spwid); } -Temperature SkyStatus::getAverageTebbSky(unsigned int spwid, +Temperature SkyStatus::getAverageTebbSky(size_t spwid, const Length &wh2o, double airmass, double skycoupling, @@ -984,8 +984,8 @@ Temperature SkyStatus::getAverageTebbSky(unsigned int spwid, getAssocSpwId(spwid)[0]); } -Temperature SkyStatus::getTebbSky(unsigned int spwid, - unsigned int nc, +Temperature SkyStatus::getTebbSky(size_t spwid, + size_t nc, const Length &wh2o, double airmass, double skycoupling, @@ -1016,7 +1016,7 @@ Temperature SkyStatus::getTebbSky(unsigned int spwid, } -Temperature SkyStatus::getAverageTrjSky(unsigned int spwid, +Temperature SkyStatus::getAverageTrjSky(size_t spwid, const Length &wh2o, double airmass, double skycoupling, @@ -1043,7 +1043,7 @@ Temperature SkyStatus::getAverageTrjSky(unsigned int spwid, spwid); } -Temperature SkyStatus::getAverageTrjSky(unsigned int spwid, +Temperature SkyStatus::getAverageTrjSky(size_t spwid, const Length &wh2o, double airmass, double skycoupling, @@ -1076,8 +1076,8 @@ Temperature SkyStatus::getAverageTrjSky(unsigned int spwid, getAssocSpwId(spwid)[0]); } -Temperature SkyStatus::getTrjSky(unsigned int spwid, - unsigned int nc, +Temperature SkyStatus::getTrjSky(size_t spwid, + size_t nc, const Length &wh2o, double airmass, double skycoupling, @@ -1109,7 +1109,7 @@ Temperature SkyStatus::getTrjSky(unsigned int spwid, -Angle SkyStatus::getDispersiveH2OPhaseDelay(unsigned int spwid, unsigned int nc) +Angle SkyStatus::getDispersiveH2OPhaseDelay(size_t spwid, size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { Angle aa(0.0, "deg"); @@ -1118,8 +1118,8 @@ Angle SkyStatus::getDispersiveH2OPhaseDelay(unsigned int spwid, unsigned int nc) return getDispersiveH2OPhaseDelay(v_transfertId_[spwid] + nc); } -Length SkyStatus::getDispersiveH2OPathLength(unsigned int spwid, - unsigned int nc) +Length SkyStatus::getDispersiveH2OPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { Length ll(0.0, "mm"); @@ -1128,8 +1128,8 @@ Length SkyStatus::getDispersiveH2OPathLength(unsigned int spwid, return getDispersiveH2OPathLength(v_transfertId_[spwid] + nc); } -Angle SkyStatus::getNonDispersiveH2OPhaseDelay(unsigned int spwid, - unsigned int nc) +Angle SkyStatus::getNonDispersiveH2OPhaseDelay(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) { Angle aa(0.0, "deg"); @@ -1138,14 +1138,14 @@ Angle SkyStatus::getNonDispersiveH2OPhaseDelay(unsigned int spwid, return getNonDispersiveH2OPhaseDelay(v_transfertId_[spwid] + nc); } -Length SkyStatus::getNonDispersiveH2OPathLength(unsigned int spwid, - unsigned int nc) +Length SkyStatus::getNonDispersiveH2OPathLength(size_t spwid, + size_t nc) { if(!spwidAndIndexAreValid(spwid, nc)) return (double) 0.0; return getNonDispersiveH2OPathLength(v_transfertId_[spwid] + nc); } -Length SkyStatus::WaterVaporRetrieval_fromFTS(unsigned int spwId, +Length SkyStatus::WaterVaporRetrieval_fromFTS(size_t spwId, const vector &v_transmission, const Frequency &f1, const Frequency &f2) @@ -1164,15 +1164,15 @@ Length SkyStatus::WaterVaporRetrieval_fromFTS(unsigned int spwId, } } - Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &v_tebb, const vector &skycoupling, const vector &tspill) { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1185,13 +1185,13 @@ Length SkyStatus::WaterVaporRetrieval_fromFTS(unsigned int spwId, tspill); } - Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, double skycoupling, const Temperature &tspill) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwId]; n++) { + for(size_t n = 0; n < v_numChan_[spwId]; n++) { spwId_filter.push_back(1.0); } return WaterVaporRetrieval_fromTEBB(spwId, @@ -1202,15 +1202,15 @@ Length SkyStatus::WaterVaporRetrieval_fromFTS(unsigned int spwId, } - Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, + Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector< vector > &vv_tebb, const vector &skycoupling, const vector &tspill) { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1223,14 +1223,14 @@ Length SkyStatus::WaterVaporRetrieval_fromFTS(unsigned int spwId, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_tebb, double skycoupling, const Temperature &tspill) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwId]; n++) { + for(size_t n = 0; n < v_numChan_[spwId]; n++) { spwId_filter.push_back(1.0); } return WaterVaporRetrieval_fromTEBB(spwId, @@ -1240,7 +1240,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, skycoupling, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &vv_tebb, const vector &skycoupling, @@ -1248,8 +1248,8 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1262,7 +1262,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId skycoupling, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &v_tebb, const vector &skycoupling, @@ -1270,8 +1270,8 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1285,7 +1285,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, const vector &spwId_filter, double skycoupling, @@ -1303,14 +1303,14 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, return Length(-999.0, "mm"); } } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector > &vv_tebb, const vector > &spwId_filters, const vector &skycoupling, const vector &tspill) { vector signalGain; - for(unsigned int i = 0; i < spwId.size(); i++) { + for(size_t i = 0; i < spwId.size(); i++) { signalGain.push_back(Percent(100.0, "%")); } return mkWaterVaporRetrieval_fromTEBB(spwId, @@ -1321,14 +1321,14 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId skycoupling, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &v_tebb, const vector > &spwId_filters, const vector &skycoupling, const vector &tspill) { vector signalGain; - for(unsigned int i = 0; i < spwId.size(); i++) { + for(size_t i = 0; i < spwId.size(); i++) { signalGain.push_back(Percent(100.0, "%")); } return mkWaterVaporRetrieval_fromTEBB(spwId, @@ -1340,7 +1340,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_tebb, const vector &spwId_filter, @@ -1359,7 +1359,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, return Length(-999.0, "mm"); } } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &vv_tebb, const vector > &spwId_filters, @@ -1374,7 +1374,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId skycoupling, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &v_tebb, const vector > &spwId_filters, @@ -1390,14 +1390,14 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, double airmass, double skycoupling, const Temperature &tspill) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwId]; n++) { + for(size_t n = 0; n < v_numChan_[spwId]; n++) { spwId_filter.push_back(1.0); } return WaterVaporRetrieval_fromTEBB(spwId, @@ -1407,7 +1407,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, skycoupling, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector > &vv_tebb, double airmass, const vector &skycoupling, @@ -1415,8 +1415,8 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1429,7 +1429,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId skycoupling, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &v_tebb, double airmass, const vector &skycoupling, @@ -1437,8 +1437,8 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1452,7 +1452,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_tebb, double airmass, @@ -1460,7 +1460,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, const Temperature &tspill) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwId]; n++) { + for(size_t n = 0; n < v_numChan_[spwId]; n++) { spwId_filter.push_back(1.0); } return WaterVaporRetrieval_fromTEBB(spwId, @@ -1471,7 +1471,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, skycoupling, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &vv_tebb, double airmass, @@ -1480,8 +1480,8 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1496,19 +1496,19 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } - Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, + Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const Temperature &tebb, double airmass, double skycoupling, const Temperature &tspill) { - vector spwIdv; + vector spwIdv; vector signalGainv; vector tebbv; vector skycouplingv; vector tspillv; - spwIdv.push_back(spwId); + spwIdv.push_back(spwId); signalGainv.push_back(signalGain); tebbv.push_back(tebb); skycouplingv.push_back(skycoupling); @@ -1518,7 +1518,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &v_tebb, double airmass, @@ -1527,8 +1527,8 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1543,7 +1543,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, const vector &spwId_filter, double airmass, @@ -1562,20 +1562,20 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, return Length(-999.0, "mm"); } } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector > &vv_tebb, const vector > &spwId_filters, double airmass, const vector &skycoupling, const vector &tspill) { - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { if(vv_tebb[j].size() != getSpectralWindow(spwId[j]).size()) { return Length(-999.0, "mm"); } } vector signalGain; - for(unsigned int i = 0; i < spwId.size(); i++) { + for(size_t i = 0; i < spwId.size(); i++) { signalGain.push_back(Percent(100.0, "%")); } return mkWaterVaporRetrieval_fromTEBB(spwId, @@ -1586,7 +1586,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId skycoupling, tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &v_tebb, const vector > &spwId_filters, double airmass, @@ -1594,7 +1594,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId const vector &tspill) { vector signalGain; - for(unsigned int i = 0; i < spwId.size(); i++) { + for(size_t i = 0; i < spwId.size(); i++) { signalGain.push_back(Percent(100.0, "%")); } return mkWaterVaporRetrieval_fromTEBB(spwId, @@ -1606,7 +1606,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &v_tebb, const vector &spwId_filter, @@ -1627,7 +1627,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(unsigned int spwId, } } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &vv_tebb, const vector > &spwId_filter, @@ -1639,7 +1639,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId if(spwId.size() != signalGain.size()) { return Length(-999.0, "mm"); } - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { if(vv_tebb[j].size() != getSpectralWindow(spwId[j]).size()) { return Length(-999.0, "mm"); } @@ -1662,8 +1662,8 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId skycoupling, tspill); } - -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, + +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &v_tebb, const vector > &spwId_filter, @@ -1696,7 +1696,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const Percent &signalGain, const vector &v_tebb, const vector > &spwId_filters, @@ -1711,7 +1711,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId v_skycoupling.reserve(spwId.size()); v_tspill.reserve(spwId.size()); - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { v_signalGain.push_back(signalGain); v_skycoupling.push_back(skycoupling); v_tspill.push_back(tspill); @@ -1724,7 +1724,7 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId v_skycoupling, v_tspill); } -Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId, const Percent &signalGain, const vector &v_tebb, double airmass, @@ -1733,8 +1733,8 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId { vector > spwId_filters; vector spwId_filter; - for(unsigned int i = 0; i < spwId.size(); i++) { - for(unsigned int n = 0; n < v_numChan_[spwId[i]]; n++) { + for(size_t i = 0; i < spwId.size(); i++) { + for(size_t n = 0; n < v_numChan_[spwId[i]]; n++) { spwId_filter.push_back(1.0); } spwId_filters.push_back(spwId_filter); @@ -1749,13 +1749,13 @@ Length SkyStatus::WaterVaporRetrieval_fromTEBB(const vector &spwId tspill); } -double SkyStatus::SkyCouplingRetrieval_fromTEBB(unsigned int spwId, +double SkyStatus::SkyCouplingRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, double skycoupling, const Temperature &tspill) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwId]; n++) { + for(size_t n = 0; n < v_numChan_[spwId]; n++) { spwId_filter.push_back(1.0); } return SkyCouplingRetrieval_fromTEBB(spwId, @@ -1765,7 +1765,7 @@ double SkyStatus::SkyCouplingRetrieval_fromTEBB(unsigned int spwId, tspill); } -double SkyStatus::SkyCouplingRetrieval_fromTEBB(unsigned int spwId, +double SkyStatus::SkyCouplingRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, const vector &spwId_filter, double skycoupling, @@ -1784,14 +1784,14 @@ double SkyStatus::SkyCouplingRetrieval_fromTEBB(unsigned int spwId, } } -double SkyStatus::SkyCouplingRetrieval_fromTEBB(unsigned int spwId, +double SkyStatus::SkyCouplingRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, double airmass, double skycoupling, const Temperature &tspill) { vector spwId_filter; - for(unsigned int n = 0; n < v_numChan_[spwId]; n++) { + for(size_t n = 0; n < v_numChan_[spwId]; n++) { spwId_filter.push_back(1.0); } return SkyCouplingRetrieval_fromTEBB(spwId, @@ -1802,7 +1802,7 @@ double SkyStatus::SkyCouplingRetrieval_fromTEBB(unsigned int spwId, tspill); } -double SkyStatus::SkyCouplingRetrieval_fromTEBB(unsigned int spwId, +double SkyStatus::SkyCouplingRetrieval_fromTEBB(size_t spwId, const vector &v_tebb, const vector &spwId_filter, double airmass, @@ -1822,7 +1822,7 @@ double SkyStatus::SkyCouplingRetrieval_fromTEBB(unsigned int spwId, } } -double SkyStatus::getSigmaTransmissionFit(unsigned int spwId, +double SkyStatus::getSigmaTransmissionFit(size_t spwId, const vector &v_transmission, double airm, const Frequency &f1, @@ -1833,9 +1833,9 @@ double SkyStatus::getSigmaTransmissionFit(unsigned int spwId, } if(v_transmission.size() == getSpectralWindow(spwId).size()) { double rms = 0.0; - unsigned int num = 0; + size_t num = 0; - for(unsigned int i = 0; i < v_transmission.size(); i++) { + for(size_t i = 0; i < v_transmission.size(); i++) { if((getSpectralWindow(spwId)[i] * 1E-09 >= f1.get("GHz") && getSpectralWindow(spwId)[i] * 1E-09 <= f2.get("GHz"))) { num++; @@ -1852,7 +1852,7 @@ double SkyStatus::getSigmaTransmissionFit(unsigned int spwId, } } -Temperature SkyStatus::getSigmaFit(unsigned int spwId, +Temperature SkyStatus::getSigmaFit(size_t spwId, const vector &v_tebbspec, const Length &wh2o, double airmass, @@ -1879,8 +1879,8 @@ Temperature SkyStatus::getSigmaFit(unsigned int spwId, return ttt; } double rms = 0.0; - unsigned int num = 0; - for(unsigned int i = 0; i < v_tebbspec.size(); i++) { + size_t num = 0; + for(size_t i = 0; i < v_tebbspec.size(); i++) { if(v_tebbspec[i].get() > 0.0) { num++; rms = rms + pow((v_tebbspec[i].get("K") - getTebbSky(spwId, @@ -1896,7 +1896,7 @@ Temperature SkyStatus::getSigmaFit(unsigned int spwId, return Temperature(rms, "K"); } -Length SkyStatus::mkWaterVaporRetrieval_fromFTS(unsigned int spwId, +Length SkyStatus::mkWaterVaporRetrieval_fromFTS(size_t spwId, const vector &measuredSkyTransmission, //double airm, // unused parameter const Frequency &fre1, @@ -1909,9 +1909,9 @@ Length SkyStatus::mkWaterVaporRetrieval_fromFTS(unsigned int spwId, vector transmission_fit; transmission_fit.reserve(measuredSkyTransmission.size()); // allows resizing - unsigned int num; + size_t num; double flamda; - unsigned int niter = 20; + size_t niter = 20; double alpha; double beta; double array; @@ -1933,12 +1933,12 @@ Length SkyStatus::mkWaterVaporRetrieval_fromFTS(unsigned int spwId, flamda = 0.001; pfit_wh2o = 1.0; // (getUserWH2O().get("mm"))/(getGroundWH2O().get("mm")); - unsigned int nl = 0; + size_t nl = 0; if(fre1.get("GHz") < 0) { nl = getSpectralWindow(spwId).size(); } else { - for(unsigned int i = 0; i < getSpectralWindow(spwId).size(); i++) { + for(size_t i = 0; i < getSpectralWindow(spwId).size(); i++) { if(getSpectralWindow(spwId)[i] * 1E-09 >= fre1.get("GHz") && getSpectralWindow(spwId)[i] * 1E-09 <= fre2.get("GHz")) { nl = nl + 1; @@ -1946,24 +1946,24 @@ Length SkyStatus::mkWaterVaporRetrieval_fromFTS(unsigned int spwId, } } - for(unsigned int kite = 0; kite < niter; kite++) { + for(size_t kite = 0; kite < niter; kite++) { num = num + 1; beta = 0.0; alpha = 0.0; - // for(unsigned int i=0; i= fre1.get("GHz") && getSpectralWindow(spwId)[i] * 1E-09 <= fre2.get("GHz"))) { - // + // transmission_fit[i] = exp(-( (getDryContOpacity(spwId, i).get()+getO2LinesOpacity(spwId, i).get()+0.65*getO3LinesOpacity(spwId, i).get() ) //getDryOpacity(spwId, i).get() + pfit_wh2o * getWetOpacity(spwId, i).get() ) ); - // + // f1 = transmission_fit[i]; psave = pfit_wh2o; pfit_wh2o = pfit_wh2o + deltaa; @@ -1978,7 +1978,7 @@ Length SkyStatus::mkWaterVaporRetrieval_fromFTS(unsigned int spwId, } chisq1 = 0; - for(unsigned int i = 0; i < getSpectralWindow(spwId).size(); i++) { + for(size_t i = 0; i < getSpectralWindow(spwId).size(); i++) { if(nl == getSpectralWindow(spwId).size() || (getSpectralWindow(spwId)[i] * 1E-09 >= fre1.get("GHz") && getSpectralWindow(spwId)[i] * 1E-09 <= fre2.get("GHz"))) { @@ -1996,7 +1996,7 @@ Length SkyStatus::mkWaterVaporRetrieval_fromFTS(unsigned int spwId, if(pfit_wh2o_b < 0.0) pfit_wh2o_b = 0.9 * pfit_wh2o; chisqr = 0; - for(unsigned int i = 0; i < getSpectralWindow(spwId).size(); i++) { + for(size_t i = 0; i < getSpectralWindow(spwId).size(); i++) { if(nl == getSpectralWindow(spwId).size() || (getSpectralWindow(spwId)[i] * 1E-09 >= fre1.get("GHz") && getSpectralWindow(spwId)[i] * 1E-09 <= fre2.get("GHz"))) { @@ -2026,7 +2026,7 @@ Length SkyStatus::mkWaterVaporRetrieval_fromFTS(unsigned int spwId, if(fabs(sqrt(chisq1) - sqrt(chisqr)) < eps) { - /* for(unsigned int i=0; i &spwId, +Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector &measuredAverageSkyTEBB, double airm, @@ -2070,9 +2070,9 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw double eps = 0.001; vector v_tebb_fit; - unsigned int num; + size_t num; double flamda; - unsigned int niter = 20; + size_t niter = 20; double alpha; double beta; double array; @@ -2095,14 +2095,14 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw pfit_wh2o = (getUserWH2O().get("mm")) / (getGroundWH2O().get("mm")); - for(unsigned int kite = 0; kite < niter; kite++) { + for(size_t kite = 0; kite < niter; kite++) { num = num + 1; beta = 0.0; alpha = 0.0; - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { f1 = RT(pfit_wh2o, @@ -2111,7 +2111,7 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw airm, spwId[j], spwId_filter[j], - signalGain[j]); // if signalGain[j] < 1.0 then there is an image side + signalGain[j]); // if signalGain[j] < 1.0 then there is an image side // band and it is correctly taken into account in RT v_tebb_fit[j] = Temperature(f1, "K"); @@ -2137,7 +2137,7 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw chisq1 = 0; - for(unsigned int j = 0; j < measuredAverageSkyTEBB.size(); j++) { + for(size_t j = 0; j < measuredAverageSkyTEBB.size(); j++) { res = -v_tebb_fit[j].get("K") + (measuredAverageSkyTEBB[j]).get("K"); chisq1 = chisq1 + res * res; @@ -2155,7 +2155,7 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw chisqr = 0; - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { v_tebb_fit[j] = Temperature(RT(pfit_wh2o_b, skycoupling[j], @@ -2213,7 +2213,7 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw } -Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spwId, +Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spwId, const vector &signalGain, const vector > &measuredSkyTEBB, double airm, @@ -2229,9 +2229,9 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw vector > vv_tebb_fit; vector v_tebb_fit; - unsigned int num; + size_t num; double flamda; - unsigned int niter = 20; + size_t niter = 20; double alpha; double beta; double array; @@ -2253,10 +2253,10 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw validchannels.reserve(spwId.size()); vv_tebb_fit.reserve(spwId.size()); - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { spwIdNorm[j] = 0.0; validchannels[j] = 0.0; - for(unsigned int i = 0; i < getSpectralWindow(spwId[j]).size(); i++) { + for(size_t i = 0; i < getSpectralWindow(spwId[j]).size(); i++) { if(spwId_filter[j][i] > 0) { spwIdNorm[j] = spwIdNorm[j] + spwId_filter[j][i]; validchannels[j] = validchannels[j] + 1.0; @@ -2268,18 +2268,18 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw flamda = 0.001; pfit_wh2o = (getUserWH2O().get("mm")) / (getGroundWH2O().get("mm")); - for(unsigned int kite = 0; kite < niter; kite++) { + for(size_t kite = 0; kite < niter; kite++) { num = num + 1; beta = 0.0; alpha = 0.0; - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { v_tebb_fit.clear(); - for(unsigned int i = 0; i < getSpectralWindow(spwId[j]).size(); i++) { + for(size_t i = 0; i < getSpectralWindow(spwId[j]).size(); i++) { if(spwId_filter[j][i] > 0) { @@ -2354,9 +2354,9 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw chisq1 = 0; - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { - for(unsigned int i = 0; i < getSpectralWindow(spwId[j]).size(); i++) { + for(size_t i = 0; i < getSpectralWindow(spwId[j]).size(); i++) { if(spwId_filter[j][i] > 0) { res = (-vv_tebb_fit[j][i].get("K") + (measuredSkyTEBB[j][i]).get("K")) @@ -2378,9 +2378,9 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw chisqr = 0; - for(unsigned int j = 0; j < spwId.size(); j++) { + for(size_t j = 0; j < spwId.size(); j++) { - for(unsigned int i = 0; i < getSpectralWindow(spwId[j]).size(); i++) { + for(size_t i = 0; i < getSpectralWindow(spwId[j]).size(); i++) { if(spwId_filter[j][i] > 0) { @@ -2459,7 +2459,7 @@ Length SkyStatus::mkWaterVaporRetrieval_fromTEBB(const vector &spw } -double SkyStatus::mkSkyCouplingRetrieval_fromTEBB(unsigned int spwId, +double SkyStatus::mkSkyCouplingRetrieval_fromTEBB(size_t spwId, const Percent &signalGain, const vector &measuredSkyTEBB, double airm, @@ -2477,9 +2477,9 @@ double SkyStatus::mkSkyCouplingRetrieval_fromTEBB(unsigned int spwId, vector tebb_fit; tebb_fit.reserve(measuredSkyTEBB.size()); // allows resizing - unsigned int num; + size_t num; double flamda; - unsigned int niter = 20; + size_t niter = 20; double alpha; double beta; double array; @@ -2501,14 +2501,14 @@ double SkyStatus::mkSkyCouplingRetrieval_fromTEBB(unsigned int spwId, // pfit_wh2o = (getUserWH2O().get("mm")) / (getGroundWH2O().get("mm")); // [-Wunused_but_set_variable] pfit_skycoupling = 1.0; - for(unsigned int kite = 0; kite < niter; kite++) { + for(size_t kite = 0; kite < niter; kite++) { num = num + 1; beta = 0.0; alpha = 0.0; - // for(unsigned int i=0; i &spwId_filter, const Percent &signalgain) { - + double tebb_channel = 0.0; double rtr; double norm = 0.0; - - for(unsigned int n = 0; n < v_numChan_[spwid]; n++) { + + for(size_t n = 0; n < v_numChan_[spwid]; n++) { if(spwId_filter[n] > 0) { norm = norm + spwId_filter[n]; } @@ -2604,7 +2604,7 @@ double SkyStatus::mkSkyCouplingRetrieval_fromTEBB(unsigned int spwId, return norm; } - for(unsigned int n = 0; n < v_numChan_[spwid]; n++) { + for(size_t n = 0; n < v_numChan_[spwid]; n++) { if(spwId_filter[n] > 0) { @@ -2632,8 +2632,8 @@ double SkyStatus::RT(double pfit_wh2o, double skycoupling, double tspill, double airm, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { double radiance; @@ -2655,26 +2655,26 @@ double SkyStatus::RT(double pfit_wh2o, kv = 0.0; radiance = 0.0; - for(unsigned int i = 0; i < getNumLayer(); i++) { - + for(size_t i = 0; i < getNumLayer(); i++) { + tau_layer = ((getAbsTotalWet(spwid, nc, i).get()) * ratioWater+ getAbsTotalDry(spwid, nc, i).get()) * getLayerThickness(i).get(); - + // cout << i << " " << getAbsTotalWet(spwid, nc, i).get() << " " << getAbsTotalDry(spwid, nc, i).get() << endl; - + radiance = radiance + (1.0 / (exp(h_div_k * singlefreq/ getLayerTemperature(i).get()) - 1.0)) * exp(-kv * airm) * (1.0- exp(-airm * tau_layer)); - + kv = kv + tau_layer; - + } - + radiance = skycoupling * (radiance + (1.0 / (exp(h_div_k * singlefreq / tbgr)- 1.0)) * exp(-kv * airm)) + (1.0 / (exp(h_div_k * singlefreq / tspill)- 1.0)) * (1 - skycoupling); - + tebb = h_div_k * singlefreq / log(1 + (1 / radiance)); - // tebb = tebb+ h_div_k * singlefreq * radiance; + // tebb = tebb+ h_div_k * singlefreq * radiance; // cout << "singlefreq = " << singlefreq << " total opacity = " << kv << " tebb = " << tebb << endl; return tebb; - + } @@ -2682,8 +2682,8 @@ double SkyStatus::RTRJ(double pfit_wh2o, double skycoupling, double tspill, double airm, - unsigned int spwid, - unsigned int nc) + size_t spwid, + size_t nc) { double radiance; @@ -2702,22 +2702,22 @@ double SkyStatus::RTRJ(double pfit_wh2o, kv = 0.0; radiance = 0.0; - for(unsigned int i = 0; i < getNumLayer(); i++) { - + for(size_t i = 0; i < getNumLayer(); i++) { + tau_layer = ((getAbsTotalWet(spwid, nc, i).get()) * ratioWater+ getAbsTotalDry(spwid, nc, i).get()) * getLayerThickness(i).get(); - + radiance = radiance + (1.0 / (exp(h_div_k * singlefreq/ getLayerTemperature(i).get()) - 1.0)) * exp(-kv * airm) * (1.0- exp(-airm * tau_layer)); - + kv = kv + tau_layer; - + } - + radiance = skycoupling * (radiance + (1.0 / (exp(h_div_k * singlefreq / tbgr)- 1.0)) * exp(-kv * airm)) + (1.0 / (exp(h_div_k * singlefreq / tspill)- 1.0)) * (1 - skycoupling); - - trj = h_div_k * singlefreq * radiance; + + trj = h_div_k * singlefreq * radiance; return trj; - + } @@ -2736,7 +2736,7 @@ void SkyStatus::iniSkyStatus() } -double SkyStatus::getAverageNonDispersiveDryPathLength_GroundPressureDerivative(unsigned int spwid) +double SkyStatus::getAverageNonDispersiveDryPathLength_GroundPressureDerivative(size_t spwid) { Pressure ref = getGroundPressure(); Length a = @@ -2748,7 +2748,7 @@ double SkyStatus::getAverageNonDispersiveDryPathLength_GroundPressureDerivative( return b.get("microns") - a.get("microns"); } -double SkyStatus::getAverageNonDispersiveDryPathLength_GroundTemperatureDerivative(unsigned int spwid) +double SkyStatus::getAverageNonDispersiveDryPathLength_GroundTemperatureDerivative(size_t spwid) { Temperature ref = getGroundTemperature(); double oldLapseRate = getTropoLapseRate(); @@ -2764,7 +2764,7 @@ double SkyStatus::getAverageNonDispersiveDryPathLength_GroundTemperatureDerivati return b.get("microns") - a.get("microns"); } -double SkyStatus::getAverageDispersiveDryPathLength_GroundPressureDerivative(unsigned int spwid) +double SkyStatus::getAverageDispersiveDryPathLength_GroundPressureDerivative(size_t spwid) { Pressure ref = getGroundPressure(); Length a = RefractiveIndexProfile::getAverageDispersiveDryPathLength(spwid); @@ -2775,7 +2775,7 @@ double SkyStatus::getAverageDispersiveDryPathLength_GroundPressureDerivative(uns return b.get("microns") - a.get("microns"); } -double SkyStatus::getAverageDispersiveDryPathLength_GroundTemperatureDerivative(unsigned int spwid) +double SkyStatus::getAverageDispersiveDryPathLength_GroundTemperatureDerivative(size_t spwid) { Temperature ref = getGroundTemperature(); double oldLapseRate = getTropoLapseRate(); @@ -2790,8 +2790,8 @@ double SkyStatus::getAverageDispersiveDryPathLength_GroundTemperatureDerivative( } Temperature SkyStatus::getWVRAverageSigmaTskyFit(const vector &RadiometerData, - unsigned int n, - unsigned int m) + size_t n, + size_t m) { double sigma = 0.0; double tr; @@ -2799,7 +2799,7 @@ Temperature SkyStatus::getWVRAverageSigmaTskyFit(const vector &R if(m < n) { return Temperature(-999, "K"); } - for(unsigned int i = n; i < m; i++) { + for(size_t i = n; i < m; i++) { tr = RadiometerData[i].getSigmaFit().get("K"); if(tr < 0) { return Temperature(-999, "K"); @@ -2815,9 +2815,9 @@ Temperature SkyStatus::getWVRAverageSigmaTskyFit(const vector &R return sigmaT; } Temperature SkyStatus::getWVRSigmaChannelTskyFit(const vector &RadiometerData, - unsigned int ichan, - unsigned int n, - unsigned int m) + size_t ichan, + size_t n, + size_t m) { double sigma = 0.0; double dtr; @@ -2825,7 +2825,7 @@ Temperature SkyStatus::getWVRSigmaChannelTskyFit(const vector &R if(m <= n) { return Temperature(-999, "K"); } - for(unsigned int i = n; i < m; i++) { + for(size_t i = n; i < m; i++) { dtr = RadiometerData[i].getmeasuredSkyBrightness()[ichan].get("K") -RadiometerData[i].getfittedSkyBrightness()[ichan].get("K"); sigma = sigma + dtr * dtr; @@ -2836,7 +2836,7 @@ Temperature SkyStatus::getWVRSigmaChannelTskyFit(const vector &R } WVRMeasurement SkyStatus::mkWaterVaporRetrieval_fromWVR(const vector &measuredSkyBrightnessVector, - const vector &IdChannels, + const vector &IdChannels, const vector &skyCoupling, const vector &signalGain, const Temperature &spilloverTemperature, @@ -2850,9 +2850,9 @@ WVRMeasurement SkyStatus::mkWaterVaporRetrieval_fromWVR(const vector tebb_fit; tebb_fit.reserve(measuredSkyBrightnessVector.size()); double airm = 1.0 / sin((3.1415926 * elevation.get("deg")) / 180.0); - unsigned int num; + size_t num; double flamda; - unsigned int niter = 20; + size_t niter = 20; double alpha; double beta; double array; @@ -2878,14 +2878,14 @@ WVRMeasurement SkyStatus::mkWaterVaporRetrieval_fromWVR(const vector ttt; - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { ttt.push_back(Temperature(tebb_fit[i], "K")); } @@ -2997,11 +2997,11 @@ WVRMeasurement SkyStatus::mkWaterVaporRetrieval_fromWVR(const vector &RadiometerData, - unsigned int n, - unsigned int m) + size_t n, + size_t m) { - for(unsigned int i = n; i < m; i++) { + for(size_t i = n; i < m; i++) { WaterVaporRetrieval_fromWVR(RadiometerData[i]); @@ -3043,17 +3043,17 @@ void SkyStatus::WaterVaporRetrieval_fromWVR(WVRMeasurement &RadiometerData) } void SkyStatus::updateSkyCoupling_fromWVR(vector &RadiometerData, - unsigned int n, - unsigned int m) + size_t n, + size_t m) { double pfit; double deltaa = 0.02; // double sig_fit = -999.0; // [-Wunused_but_set_variable] double eps = 0.01; - unsigned int num; + size_t num; double flamda; - unsigned int niter = 20; + size_t niter = 20; double alpha; double beta; double array; @@ -3073,13 +3073,13 @@ void SkyStatus::updateSkyCoupling_fromWVR(vector &RadiometerData // Find the maximum of skycoupling on the WVR channels // This value is used to assure that the found skycoupling does not exceed 1 - double maxCoupling =0.; - for (unsigned int i=0; imaxCoupling) maxCoupling = waterVaporRadiometer_.getSkyCoupling()[i]; - for(unsigned int kite = 0; kite < niter; kite++) { + for(size_t kite = 0; kite < niter; kite++) { num = num + 1; beta = 0.0; @@ -3116,7 +3116,7 @@ void SkyStatus::updateSkyCoupling_fromWVR(vector &RadiometerData } if (pfit_b*maxCoupling>1.5) pfit_b = 1; - + res = sigmaSkyCouplingRetrieval_fromWVR(pfit_b, waterVaporRadiometer_, RadiometerData, @@ -3148,18 +3148,18 @@ void SkyStatus::updateSkyCoupling_fromWVR(vector &RadiometerData } void SkyStatus::updateSkyCouplingChannel_fromWVR(vector &RadiometerData, - unsigned int ichan, - unsigned int n, - unsigned int m) + size_t ichan, + size_t n, + size_t m) { double pfit; double deltaa = 0.02; // double sig_fit = -999.0; // [-Wunused_but_set_variable] double eps = 0.01; - unsigned int num; + size_t num; double flamda; - unsigned int niter = 20; + size_t niter = 20; double alpha; double beta; double array; @@ -3181,7 +3181,7 @@ void SkyStatus::updateSkyCouplingChannel_fromWVR(vector &Radiome double maxCoupling = waterVaporRadiometer_.getSkyCoupling()[ichan]; - for(unsigned int kite = 0; kite < niter; kite++) { + for(size_t kite = 0; kite < niter; kite++) { num = num + 1; beta = 0.0; @@ -3220,7 +3220,7 @@ void SkyStatus::updateSkyCouplingChannel_fromWVR(vector &Radiome } if (pfit_b*maxCoupling>1) pfit_b = 1/maxCoupling; - + res = sigmaSkyCouplingChannelRetrieval_fromWVR(pfit_b, waterVaporRadiometer_, RadiometerData, @@ -3256,19 +3256,19 @@ void SkyStatus::updateSkyCouplingChannel_fromWVR(vector &Radiome double SkyStatus::sigmaSkyCouplingRetrieval_fromWVR(double par_fit, const WaterVaporRadiometer &wvr, vector &RadiometerData, - unsigned int n, - unsigned int m) + size_t n, + size_t m) { vector skyCoupling = wvr.getSkyCoupling(); - for(unsigned int i = 0; i < skyCoupling.size(); i++) { + for(size_t i = 0; i < skyCoupling.size(); i++) { skyCoupling[i] = skyCoupling[i] * par_fit; } WVRMeasurement RadiometerData_withRetrieval; - for(unsigned int i = n; i < m; i++) { + for(size_t i = n; i < m; i++) { RadiometerData_withRetrieval = mkWaterVaporRetrieval_fromWVR(RadiometerData[i].getmeasuredSkyBrightness(), @@ -3291,20 +3291,20 @@ double SkyStatus::sigmaSkyCouplingRetrieval_fromWVR(double par_fit, double SkyStatus::sigmaSkyCouplingChannelRetrieval_fromWVR(double par_fit, const WaterVaporRadiometer &wvr, vector &RadiometerData, - unsigned int ichan, - unsigned int n, - unsigned int m) + size_t ichan, + size_t n, + size_t m) { vector skyCoupling = wvr.getSkyCoupling(); - //for(unsigned int i = 0; i < skyCoupling.size(); i++) { + //for(size_t i = 0; i < skyCoupling.size(); i++) { skyCoupling[ichan] = skyCoupling[ichan] * par_fit; //} WVRMeasurement RadiometerData_withRetrieval; - for(unsigned int i = n; i < m; i++) { + for(size_t i = n; i < m; i++) { RadiometerData_withRetrieval = mkWaterVaporRetrieval_fromWVR(RadiometerData[i].getmeasuredSkyBrightness(), @@ -3332,4 +3332,3 @@ void SkyStatus::rmSkyStatus() } ATM_NAMESPACE_END - diff --git a/src/libaatm/src/ATMSpectralGrid.cpp b/src/libaatm/src/ATMSpectralGrid.cpp index 6902740..53aa09e 100644 --- a/src/libaatm/src/ATMSpectralGrid.cpp +++ b/src/libaatm/src/ATMSpectralGrid.cpp @@ -42,18 +42,18 @@ SpectralGrid::SpectralGrid(const Frequency &oneFreq) v_chanFreq_.reserve(1); freqUnits_ = "Hz"; v_transfertId_.resize(0); // not sure this is necessary! - unsigned int numChan = 1; - unsigned int refChan = 0; + size_t numChan = 1; + size_t refChan = 0; Frequency chanSep(0.0); add(numChan, refChan, oneFreq, chanSep); - std::vector v_dummyInt; + std::vector v_dummyInt; vv_assocSpwId_.push_back(v_dummyInt); // put an empty std::vector std::vector v_dummyString; vv_assocNature_.push_back(v_dummyString); // put an empty std::vector } -SpectralGrid::SpectralGrid(unsigned int numChan, - unsigned int refChan, +SpectralGrid::SpectralGrid(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep) { @@ -62,14 +62,14 @@ SpectralGrid::SpectralGrid(unsigned int numChan, freqUnits_ = "Hz"; v_transfertId_.resize(0); // not sure this is necessary! add(numChan, refChan, refFreq, chanSep); - std::vector v_dummyInt; + std::vector v_dummyInt; vv_assocSpwId_.push_back(v_dummyInt); // put an empty std::vector std::vector v_dummyString; vv_assocNature_.push_back(v_dummyString); // put an empty std::vector } -SpectralGrid::SpectralGrid(unsigned int numChan, - unsigned int refChan, +SpectralGrid::SpectralGrid(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep, const Frequency &intermediateFreq, @@ -83,8 +83,8 @@ SpectralGrid::SpectralGrid(unsigned int numChan, add(numChan, refChan, refFreq, chanSep, intermediateFreq, sbSide, sbType); } -SpectralGrid::SpectralGrid(unsigned int numChan, - unsigned int refChan, +SpectralGrid::SpectralGrid(size_t numChan, + size_t refChan, double* chanFreq, const std::string &freqUnits) { @@ -94,8 +94,8 @@ SpectralGrid::SpectralGrid(unsigned int numChan, add(numChan, refChan, chanFreq, freqUnits); } -void SpectralGrid::add(unsigned int numChan, - unsigned int refChan, +void SpectralGrid::add(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep, const Frequency &intermediateFreq, @@ -106,9 +106,9 @@ void SpectralGrid::add(unsigned int numChan, double chSep; std::vector v_assocNature; - std::vector v_assocSpwId; + std::vector v_assocSpwId; - unsigned int spwId = v_transfertId_.size(); + size_t spwId = v_transfertId_.size(); if(sbSide == LSB) { // LSB tuning // the LSB: @@ -168,14 +168,14 @@ void SpectralGrid::add(unsigned int numChan, } } -unsigned int SpectralGrid::add(unsigned int numChan, - unsigned int refChan, +size_t SpectralGrid::add(size_t numChan, + size_t refChan, const Frequency &refFreq, const Frequency &chanSep) { freqUnits_ = "Hz"; - unsigned int spwId = v_transfertId_.size(); + size_t spwId = v_transfertId_.size(); v_loFreq_.push_back(refFreq.get()); if(spwId == 0) { @@ -199,7 +199,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, double freqOffset = v_refFreq_[spwId] - v_chanSep_[spwId] * (double) (v_refChan_[spwId]); - for(unsigned int i = 0; i < numChan; i++) { + for(size_t i = 0; i < numChan; i++) { chanFreq[i] = freqOffset + (double) i * v_chanSep_[spwId]; } appendChanFreq(numChan, chanFreq); @@ -221,7 +221,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, v_sidebandType_ .push_back(NOTYPE); v_intermediateFrequency_.push_back(0.0); } - std::vector v_dummyAssoc; + std::vector v_dummyAssoc; vv_assocSpwId_.push_back(v_dummyAssoc); std::vector v_dummyNature; vv_assocNature_.push_back(v_dummyNature); @@ -230,26 +230,26 @@ unsigned int SpectralGrid::add(unsigned int numChan, return spwId; } -void SpectralGrid::appendChanFreq(unsigned int numChan, double* chanFreq) +void SpectralGrid::appendChanFreq(size_t numChan, double* chanFreq) { - // unsigned int k=v_chanFreq_.size(); - for(unsigned int i = 0; i < numChan; i++) { + // size_t k=v_chanFreq_.size(); + for(size_t i = 0; i < numChan; i++) { v_chanFreq_.push_back(chanFreq[i]); // cout << i << "v_chanFreq_="< &chanFreq) +void SpectralGrid::appendChanFreq(size_t numChan, const std::vector &chanFreq) { - // unsigned int k=v_chanFreq_.size(); - for(unsigned int i = 0; i < numChan; i++) { + // size_t k=v_chanFreq_.size(); + for(size_t i = 0; i < numChan; i++) { v_chanFreq_.push_back(chanFreq[i]); // cout << i << "v_chanFreq_="< 1) chanSep = fact * (chanFreq[1] - chanFreq[0]); chanFreq[0] = fact * chanFreq[0]; - for(unsigned int i = 1; i < numChan; i++) { + for(size_t i = 1; i < numChan; i++) { chanFreq[i] = fact * chanFreq[i]; if(fabs(chanFreq[i] - chanFreq[i - 1] - chanSep) > 1.0E-12) regular = false; if(chanFreq[i] < minFreq) minFreq = chanFreq[i]; @@ -296,7 +296,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, return spwId; } -SpectralGrid::SpectralGrid(unsigned int numChan, +SpectralGrid::SpectralGrid(size_t numChan, double refFreq, double* chanFreq, const std::string &freqUnits) @@ -305,7 +305,7 @@ SpectralGrid::SpectralGrid(unsigned int numChan, freqUnits_ = "Hz"; v_transfertId_.resize(0); // not sure this is necessary! add(numChan, refFreq, chanFreq, freqUnits); - std::vector v_dummyInt; + std::vector v_dummyInt; vv_assocSpwId_.push_back(v_dummyInt); // put an empty std::vector std::vector v_dummyString; vv_assocNature_.push_back(v_dummyString); // put an empty std::vector @@ -319,7 +319,7 @@ SpectralGrid::SpectralGrid(double refFreq, freqUnits_ = "Hz"; v_transfertId_.resize(0); // not sure this is necessary! add(chanFreq.size(), refFreq, chanFreq, freqUnits); - std::vector v_dummyInt; + std::vector v_dummyInt; vv_assocSpwId_.push_back(v_dummyInt); // put an empty std::vector std::vector v_dummyString; vv_assocNature_.push_back(v_dummyString); // put an empty std::vector @@ -333,7 +333,7 @@ SpectralGrid::SpectralGrid(const std::vector &chanFreq, const std::strin double refFreq = (Frequency(chanFreq[0], freqUnits)).get("Hz"); // We take the frequency of the first channel as // reference frequency because it has not been specified add(chanFreq.size(), refFreq, chanFreq, freqUnits); - std::vector v_dummyInt; + std::vector v_dummyInt; vv_assocSpwId_.push_back(v_dummyInt); // put an empty std::vector std::vector v_dummyString; vv_assocNature_.push_back(v_dummyString); // put an empty std::vector @@ -347,18 +347,18 @@ SpectralGrid::SpectralGrid(const std::vector &chanFreq) double refFreq = chanFreq[0].get("Hz"); // We take the frequency of the first channel as // reference frequency because it has not been specified std::vector chanFreq_double; - for(unsigned int i = 0; i < chanFreq.size(); i++) { + for(size_t i = 0; i < chanFreq.size(); i++) { chanFreq_double.push_back(chanFreq[i].get("GHz")); } add(chanFreq.size(), refFreq, chanFreq_double, "GHz"); - std::vector v_dummyInt; + std::vector v_dummyInt; vv_assocSpwId_.push_back(v_dummyInt); // put an empty std::vector std::vector v_dummyString; vv_assocNature_.push_back(v_dummyString); // put an empty std::vector } -unsigned int SpectralGrid::add(unsigned int numChan, +size_t SpectralGrid::add(size_t numChan, double refFreq, double* chanFreq, const std::string &freqUnits) @@ -372,7 +372,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, freqUnits_ = "Hz"; - unsigned int spwId = v_transfertId_.size(); + size_t spwId = v_transfertId_.size(); if(spwId == 0) { v_transfertId_.push_back(0); } else { @@ -387,7 +387,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, double maxFreq = 0; chanFreq[0] = fact * chanFreq[0]; - for(unsigned int i = 1; i < numChan; i++) { + for(size_t i = 1; i < numChan; i++) { chanFreq[i] = fact * chanFreq[i]; if(fabs(chanFreq[i] - chanFreq[i - 1] - chanSep) > 1.0E-12) regular = false; if(chanFreq[i] < minFreq) minFreq = chanFreq[i]; @@ -399,7 +399,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, if(numChan > 1) { if(regular) { - v_refChan_.push_back((unsigned int) (1. + (refFreq - v_chanFreq_[0] + v_refChan_.push_back((size_t) (1. + (refFreq - v_chanFreq_[0] + 1.E-12) / chanSep)); v_chanSep_.push_back(chanSep); } else { @@ -417,7 +417,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, return spwId; } - unsigned int SpectralGrid::add(unsigned int numChan, + size_t SpectralGrid::add(size_t numChan, double refFreq, const std::vector &chanFreq, const std::string &freqUnits) @@ -431,7 +431,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, freqUnits_ = "Hz"; - unsigned int spwId = v_transfertId_.size(); + size_t spwId = v_transfertId_.size(); if(spwId == 0) { v_transfertId_.push_back(0); } else { @@ -448,7 +448,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, double minFreq = chanFreqHz[0]; double maxFreq = chanFreqHz[0]; - for(unsigned int i = 1; i < numChan; i++) { + for(size_t i = 1; i < numChan; i++) { chanFreqHz[i] = fact * chanFreq[i]; if(fabs(chanFreqHz[i] - chanFreqHz[i - 1] - chanSep) > 1.0E-12) regular = false; if(chanFreqHz[i] < minFreq) minFreq = chanFreqHz[i]; @@ -460,7 +460,7 @@ unsigned int SpectralGrid::add(unsigned int numChan, if(numChan > 1) { if(regular) { - v_refChan_.push_back((unsigned int) (1. + (refFreq - v_chanFreq_[0] + v_refChan_.push_back((size_t) (1. + (refFreq - v_chanFreq_[0] + 1.E-12) / chanSep)); v_chanSep_.push_back(chanSep); } else { @@ -510,7 +510,7 @@ SpectralGrid::~SpectralGrid() { } -bool SpectralGrid::wrongSpwId(unsigned int spwId) const +bool SpectralGrid::wrongSpwId(size_t spwId) const { if(spwId > (v_transfertId_.size() - 1)) { std::cout << " SpectralGrid: ERROR: " << spwId @@ -521,25 +521,26 @@ bool SpectralGrid::wrongSpwId(unsigned int spwId) const } // accessors and utilities: -unsigned int SpectralGrid::getNumSpectralWindow() const +size_t SpectralGrid::getNumSpectralWindow() const { return v_transfertId_.size(); } -unsigned int SpectralGrid::getNumChan() const +size_t SpectralGrid::getNumChan() const { return v_numChan_[0]; } -unsigned int SpectralGrid::getNumChan(unsigned int spwId) const +size_t SpectralGrid::getNumChan(size_t spwId) const { - if(wrongSpwId(spwId)) return 0; + size_t temp = 0; + if(wrongSpwId(spwId)) return temp; return v_numChan_[spwId]; } -unsigned int SpectralGrid::getRefChan() const +size_t SpectralGrid::getRefChan() const { return v_refChan_[0]; } -unsigned int SpectralGrid::getRefChan(unsigned int spwId) const +size_t SpectralGrid::getRefChan(size_t spwId) const { if(wrongSpwId(spwId)) return 32767; return v_refChan_[spwId]; @@ -549,7 +550,7 @@ Frequency SpectralGrid::getRefFreq() const { return Frequency(v_refFreq_[0], "Hz"); } -Frequency SpectralGrid::getRefFreq(unsigned int spwId) const +Frequency SpectralGrid::getRefFreq(size_t spwId) const { if(wrongSpwId(spwId)) return 32767.; return Frequency(v_refFreq_[spwId], "Hz"); @@ -559,18 +560,18 @@ Frequency SpectralGrid::getChanSep() const { return Frequency(v_chanSep_[0], "Hz"); } -Frequency SpectralGrid::getChanSep(unsigned int spwId) const +Frequency SpectralGrid::getChanSep(size_t spwId) const { if(wrongSpwId(spwId)) return 32767.; return Frequency(v_chanSep_[spwId], "Hz"); } -Frequency SpectralGrid::getChanFreq(unsigned int i) const +Frequency SpectralGrid::getChanFreq(size_t i) const { return Frequency(v_chanFreq_[i], "Hz"); } -Frequency SpectralGrid::getChanWidth(unsigned int i) const +Frequency SpectralGrid::getChanWidth(size_t i) const { if(i == 0){ return getChanFreq(i+1)-getChanFreq(i); @@ -579,20 +580,20 @@ Frequency SpectralGrid::getChanWidth(unsigned int i) const } } -Frequency SpectralGrid::getChanFreq(unsigned int spwId, unsigned int chanIdx) const +Frequency SpectralGrid::getChanFreq(size_t spwId, size_t chanIdx) const { if(wrongSpwId(spwId)) return 32767.; return Frequency(v_chanFreq_[v_transfertId_[spwId] + chanIdx], "Hz"); } -Frequency SpectralGrid::getChanWidth(unsigned int spwId, unsigned int chanIdx) const +Frequency SpectralGrid::getChanWidth(size_t spwId, size_t chanIdx) const { if(wrongSpwId(spwId)) return 32767.; - unsigned int banda=spwId; - unsigned int canalmasuno=chanIdx+1; - unsigned int canal=chanIdx; - unsigned int canalmenosuno=chanIdx-1; + size_t banda=spwId; + size_t canalmasuno=chanIdx+1; + size_t canal=chanIdx; + size_t canalmenosuno=chanIdx-1; // cout << "banda,canal-1,canal,canal+1= " << banda << " " << canalmenosuno << " " << canal << " " << canalmasuno << endl; if(chanIdx == 0){ @@ -604,28 +605,28 @@ Frequency SpectralGrid::getChanWidth(unsigned int spwId, unsigned int chanIdx) c } } -std::vector SpectralGrid::getSbChanFreq(unsigned int spwId, - unsigned int chanIdx, +std::vector SpectralGrid::getSbChanFreq(size_t spwId, + size_t chanIdx, const std::string &units) const { std::vector v_dummyVector; if(wrongSpwId(spwId)) return v_dummyVector; v_dummyVector.push_back(getChanFreq(spwId, chanIdx).get(units)); - for(unsigned int n = 0; n < vv_assocNature_[spwId].size(); n++) { + for(size_t n = 0; n < vv_assocNature_[spwId].size(); n++) { if(vv_assocNature_[spwId][n] == "USB" || vv_assocNature_[spwId][n] == "LSB") { - unsigned int assocSpwId = vv_assocSpwId_[spwId][n]; + size_t assocSpwId = vv_assocSpwId_[spwId][n]; v_dummyVector.push_back(getChanFreq(assocSpwId, chanIdx).get(units)); } } return v_dummyVector; } -std::vector SpectralGrid::getSpectralWindow(unsigned int spwId) const +std::vector SpectralGrid::getSpectralWindow(size_t spwId) const { std::vector v_chanFreq; if(wrongSpwId(spwId)) return v_chanFreq; v_chanFreq.reserve(v_numChan_[spwId]); - for(unsigned int n = 0; n < v_numChan_[spwId]; n++) + for(size_t n = 0; n < v_numChan_[spwId]; n++) v_chanFreq.push_back(v_chanFreq_[v_transfertId_[spwId] + n]); return v_chanFreq; } @@ -634,7 +635,7 @@ Frequency SpectralGrid::getMinFreq() const { return Frequency(v_minFreq_[0], "Hz"); } -Frequency SpectralGrid::getMinFreq(unsigned int spwId) const +Frequency SpectralGrid::getMinFreq(size_t spwId) const { if(wrongSpwId(spwId)) return 32767.; return Frequency(v_minFreq_[spwId], "Hz"); @@ -644,7 +645,7 @@ Frequency SpectralGrid::getMaxFreq() const { return Frequency(v_maxFreq_[0], "Hz"); } -Frequency SpectralGrid::getMaxFreq(unsigned int spwId) const +Frequency SpectralGrid::getMaxFreq(size_t spwId) const { if(wrongSpwId(spwId)) return 32767.; return Frequency(v_maxFreq_[spwId], "Hz"); @@ -655,8 +656,8 @@ double SpectralGrid::getChanNum(double freq) const if(v_numChan_[0] == 1) return 1; if(v_chanSep_[0] == 0.0) { // irregular grid, look for the nearest channel double sep = 1.E30; - int k = -1; - for(unsigned int i = 0; i < v_numChan_[0]; i++) { + long int k = -1; + for(size_t i = 0; i < v_numChan_[0]; i++) { if(sep > fabs(v_chanFreq_[v_transfertId_[0] + i] - freq)) { sep = fabs(v_chanFreq_[v_transfertId_[0] + i] - freq); k = i; @@ -667,14 +668,14 @@ double SpectralGrid::getChanNum(double freq) const return (freq - v_refFreq_[0]) / v_chanSep_[0]; } } -double SpectralGrid::getChanNum(unsigned int spwId, double freq) const +double SpectralGrid::getChanNum(size_t spwId, double freq) const { if(wrongSpwId(spwId)) return 32767.; if(v_numChan_[spwId] == 1) return 1; if(v_chanSep_[spwId] == 0.0) { // irregular grid, look for the nearest channel double sep = 1.E30; - int k = -1; - for(unsigned int i = 0; i < v_numChan_[spwId]; i++) { + long int k = -1; + for(size_t i = 0; i < v_numChan_[spwId]; i++) { if(sep > fabs(v_chanFreq_[v_transfertId_[spwId] + i] - freq)) { sep = fabs(v_chanFreq_[v_transfertId_[spwId] + i] - freq); k = i; @@ -691,7 +692,7 @@ Frequency SpectralGrid::getBandwidth() const return Frequency(v_maxFreq_[0] - v_minFreq_[0], "Hz"); } -Frequency SpectralGrid::getBandwidth(unsigned int spwId) const +Frequency SpectralGrid::getBandwidth(size_t spwId) const { if(wrongSpwId(spwId)) return 32767.; return Frequency(v_maxFreq_[spwId] - v_minFreq_[spwId], "Hz"); @@ -703,14 +704,14 @@ bool SpectralGrid::isRegular() const return true; } -bool SpectralGrid::isRegular(unsigned int spwId) const +bool SpectralGrid::isRegular(size_t spwId) const { if(wrongSpwId(spwId)) return false; if(v_chanSep_[spwId] == 0.0) return false; return true; } -std::string SpectralGrid::getSidebandSide(unsigned int spwId) const +std::string SpectralGrid::getSidebandSide(size_t spwId) const { if(!wrongSpwId(spwId)) { if(vv_assocSpwId_[spwId].size() == 0) { @@ -725,7 +726,7 @@ std::string SpectralGrid::getSidebandSide(unsigned int spwId) const return ""; } -std::string SpectralGrid::getSidebandType(unsigned int spwId) const +std::string SpectralGrid::getSidebandType(size_t spwId) const { if(!wrongSpwId(spwId)) { if(vv_assocSpwId_[spwId].size() == 0) { @@ -740,7 +741,7 @@ std::string SpectralGrid::getSidebandType(unsigned int spwId) const return ""; } -std::string SpectralGrid::getSideband(unsigned int spwId) const +std::string SpectralGrid::getSideband(size_t spwId) const { if(!wrongSpwId(spwId)) { if(vv_assocSpwId_[spwId].size() == 0) { @@ -758,7 +759,7 @@ std::string SpectralGrid::getSideband(unsigned int spwId) const return ""; } -std::vector SpectralGrid::getAssocNature(unsigned int spwId) const +std::vector SpectralGrid::getAssocNature(size_t spwId) const { if(!wrongSpwId(spwId)) { if(vv_assocNature_[spwId].size() == 0) { @@ -771,7 +772,7 @@ std::vector SpectralGrid::getAssocNature(unsigned int spwId) const return v_dummyVector; } -std::vector SpectralGrid::getAssocSpwId(unsigned int spwId) const +std::vector SpectralGrid::getAssocSpwId(size_t spwId) const { if(!wrongSpwId(spwId)) { if(vv_assocSpwId_[spwId].size() == 0) { @@ -782,17 +783,17 @@ std::vector SpectralGrid::getAssocSpwId(unsigned int spwId) const return vv_assocSpwId_[spwId]; } - std::vector v_dummyVector; + std::vector v_dummyVector; return v_dummyVector; } -std::vector SpectralGrid::getAssocSpwIds(const std::vector &spwIds) const +std::vector SpectralGrid::getAssocSpwIds(const std::vector &spwIds) const { - unsigned int spwId; - std::vector assoc_spwIds; + size_t spwId; + std::vector assoc_spwIds; - for(unsigned int n = 0; n < spwIds.size(); n++) { + for(size_t n = 0; n < spwIds.size(); n++) { spwId = spwIds[n]; @@ -820,11 +821,10 @@ double SpectralGrid::getLoFrequency() const return v_loFreq_[0]; } -double SpectralGrid::getLoFrequency(unsigned int spwId) const +double SpectralGrid::getLoFrequency(size_t spwId) const { if(wrongSpwId(spwId)) return 32767.; return v_loFreq_[spwId]; } ATM_NAMESPACE_END - diff --git a/src/libaatm/src/ATMWVRMeasurement.cpp b/src/libaatm/src/ATMWVRMeasurement.cpp index 48d0a42..324c285 100644 --- a/src/libaatm/src/ATMWVRMeasurement.cpp +++ b/src/libaatm/src/ATMWVRMeasurement.cpp @@ -43,7 +43,7 @@ WVRMeasurement::WVRMeasurement(const Angle &elevation, v_measuredSkyBrightness_ = measuredSkyBrightness; retrievedWaterVaporColumn_ = Length(-999, "mm"); // !< Retrieved zenith water vapor column for each event sigma_fittedSkyBrightness_ = Temperature(-999, "K"); // !< Sigma on the fitted sky brightness temperatures (average sigma over the WVR channels for each event). - for(unsigned int i = 0; i < v_measuredSkyBrightness_.size(); i++) { + for(size_t i = 0; i < v_measuredSkyBrightness_.size(); i++) { v_fittedSkyBrightness_.push_back(Temperature(-999, "K")); } // !< Fitted sky brightness temperatures over all WVR channels for each event } diff --git a/src/libaatm/src/ATMWaterVaporRadiometer.cpp b/src/libaatm/src/ATMWaterVaporRadiometer.cpp index 840eeb9..db6d975 100644 --- a/src/libaatm/src/ATMWaterVaporRadiometer.cpp +++ b/src/libaatm/src/ATMWaterVaporRadiometer.cpp @@ -34,7 +34,7 @@ ATM_NAMESPACE_BEGIN -WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels) +WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels) { spilloverTemperature_ = Temperature(-999.0, "K"); @@ -42,7 +42,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh Percent sg(50, "%"); // IF DOUBLE SIDE BAND, Default Sideband Gain is 50% - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { skyCoupling_.push_back(1.0); signalGain_.push_back(sg); @@ -51,7 +51,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh } -WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, +WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, const std::vector &skyCoupling) { @@ -61,17 +61,17 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh /* if(IdChannels.size()!=skyCoupling.size()){throw Error();} */ if(IdChannels.size() < skyCoupling.size()) { - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { skyCoupling_.push_back(skyCoupling[i]); } } else { if(IdChannels.size() == skyCoupling.size()) { skyCoupling_ = skyCoupling; } else { - for(unsigned int i = 0; i < skyCoupling.size(); i++) { + for(size_t i = 0; i < skyCoupling.size(); i++) { skyCoupling_.push_back(skyCoupling[i]); } - for(unsigned int i = skyCoupling.size(); i < IdChannels.size(); i++) { + for(size_t i = skyCoupling.size(); i < IdChannels.size(); i++) { skyCoupling_.push_back(skyCoupling[skyCoupling.size() - 1]); } } @@ -79,7 +79,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh } -WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, +WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, const std::vector &signalGain) { @@ -87,17 +87,17 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh IdChannels_ = IdChannels; if(IdChannels.size() < signalGain.size()) { - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { signalGain_.push_back(signalGain[i]); } } else { if(IdChannels.size() == signalGain.size()) { signalGain_ = signalGain; } else { - for(unsigned int i = 0; i < signalGain.size(); i++) { + for(size_t i = 0; i < signalGain.size(); i++) { signalGain_.push_back(signalGain[i]); } - for(unsigned int i = signalGain.size(); i < IdChannels.size(); i++) { + for(size_t i = signalGain.size(); i < IdChannels.size(); i++) { signalGain_.push_back(signalGain[signalGain.size() - 1]); } } @@ -105,7 +105,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh } -WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, +WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, const std::vector &skyCoupling, const std::vector &signalGain) { @@ -114,34 +114,34 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh IdChannels_ = IdChannels; if(IdChannels.size() < skyCoupling.size()) { - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { skyCoupling_.push_back(skyCoupling[i]); } } else { if(IdChannels.size() == skyCoupling.size()) { skyCoupling_ = skyCoupling; } else { - for(unsigned int i = 0; i < skyCoupling.size(); i++) { + for(size_t i = 0; i < skyCoupling.size(); i++) { skyCoupling_.push_back(skyCoupling[i]); } - for(unsigned int i = skyCoupling.size(); i < IdChannels.size(); i++) { + for(size_t i = skyCoupling.size(); i < IdChannels.size(); i++) { skyCoupling_.push_back(skyCoupling[skyCoupling.size() - 1]); } } } if(IdChannels.size() < signalGain.size()) { - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { signalGain_.push_back(signalGain[i]); } } else { if(IdChannels.size() == signalGain.size()) { signalGain_ = signalGain; } else { - for(unsigned int i = 0; i < signalGain.size(); i++) { + for(size_t i = 0; i < signalGain.size(); i++) { signalGain_.push_back(signalGain[i]); } - for(unsigned int i = signalGain.size(); i < IdChannels.size(); i++) { + for(size_t i = signalGain.size(); i < IdChannels.size(); i++) { signalGain_.push_back(signalGain[signalGain.size() - 1]); } } @@ -149,7 +149,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh } -WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, +WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, const Temperature &spilloverTemperature) { @@ -158,7 +158,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh Percent sg(50, "%"); // IF DOUBLE SIDE BAND, Default Sideband Gain is 50% - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { skyCoupling_.push_back(1.0); signalGain_.push_back(sg); @@ -167,7 +167,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh } -WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, +WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, const std::vector &skyCoupling, const Temperature &spilloverTemperature) { @@ -176,17 +176,17 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh IdChannels_ = IdChannels; if(IdChannels.size() < skyCoupling.size()) { - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { skyCoupling_.push_back(skyCoupling[i]); } } else { if(IdChannels.size() == skyCoupling.size()) { skyCoupling_ = skyCoupling; } else { - for(unsigned int i = 0; i < skyCoupling.size(); i++) { + for(size_t i = 0; i < skyCoupling.size(); i++) { skyCoupling_.push_back(skyCoupling[i]); } - for(unsigned int i = skyCoupling.size(); i < IdChannels.size(); i++) { + for(size_t i = skyCoupling.size(); i < IdChannels.size(); i++) { skyCoupling_.push_back(skyCoupling[skyCoupling.size() - 1]); } } @@ -194,7 +194,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh } -WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, +WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, const std::vector &signalGain, const Temperature &spilloverTemperature) { @@ -203,17 +203,17 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh IdChannels_ = IdChannels; if(IdChannels.size() < signalGain.size()) { - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { signalGain_.push_back(signalGain[i]); } } else { if(IdChannels.size() == signalGain.size()) { signalGain_ = signalGain; } else { - for(unsigned int i = 0; i < signalGain.size(); i++) { + for(size_t i = 0; i < signalGain.size(); i++) { signalGain_.push_back(signalGain[i]); } - for(unsigned int i = signalGain.size(); i < IdChannels.size(); i++) { + for(size_t i = signalGain.size(); i < IdChannels.size(); i++) { signalGain_.push_back(signalGain[signalGain.size() - 1]); } } @@ -221,7 +221,7 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh } -WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, +WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdChannels, const std::vector &skyCoupling, const std::vector &signalGain, const Temperature &spilloverTemperature) @@ -231,34 +231,34 @@ WaterVaporRadiometer::WaterVaporRadiometer(const std::vector &IdCh IdChannels_ = IdChannels; if(IdChannels.size() < skyCoupling.size()) { - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { skyCoupling_.push_back(skyCoupling[i]); } } else { if(IdChannels.size() == skyCoupling.size()) { skyCoupling_ = skyCoupling; } else { - for(unsigned int i = 0; i < skyCoupling.size(); i++) { + for(size_t i = 0; i < skyCoupling.size(); i++) { skyCoupling_.push_back(skyCoupling[i]); } - for(unsigned int i = skyCoupling.size(); i < IdChannels.size(); i++) { + for(size_t i = skyCoupling.size(); i < IdChannels.size(); i++) { skyCoupling_.push_back(skyCoupling[skyCoupling.size() - 1]); } } } if(IdChannels.size() < signalGain.size()) { - for(unsigned int i = 0; i < IdChannels.size(); i++) { + for(size_t i = 0; i < IdChannels.size(); i++) { signalGain_.push_back(signalGain[i]); } } else { if(IdChannels.size() == signalGain.size()) { signalGain_ = signalGain; } else { - for(unsigned int i = 0; i < signalGain.size(); i++) { + for(size_t i = 0; i < signalGain.size(); i++) { signalGain_.push_back(signalGain[i]); } - for(unsigned int i = signalGain.size(); i < IdChannels.size(); i++) { + for(size_t i = signalGain.size(); i < IdChannels.size(); i++) { signalGain_.push_back(signalGain[signalGain.size() - 1]); } } diff --git a/src/test/AbInitioTest.cpp b/src/test/AbInitioTest.cpp index dd9e41c..cf3bd36 100644 --- a/src/test/AbInitioTest.cpp +++ b/src/test/AbInitioTest.cpp @@ -84,7 +84,7 @@ int main() cout << " AbInitioTest: Pressure step factor: 1.2 (please check the above reference)" << endl; // Atmospheretype atmType = tropical; // Atmospheric type (to reproduce behavior above the tropopause) - unsigned int atmType = 1; // TROPICAL + size_t atmType = 1; // TROPICAL Temperature T( 268.15,"K" ); // Ground temperature Pressure P( 623.0,"mb"); // Ground Pressure Humidity H( 11.30,"%" ); // Ground Relative Humidity (indication) @@ -104,9 +104,9 @@ int main() cout << " AbInitioTest: 3 WATER VAPOR RADIOMETER CHANNELS + 1 ASTRONOMICAL BAND " << endl; cout << " AbInitioTest: (Negative frequency resolutions are used for image side bands) " << endl; - vector WVR_signalId; // IDs of the Signal Side Band of each Water Vapor Radiometer Channel in the SpectralGrid object. + vector WVR_signalId; // IDs of the Signal Side Band of each Water Vapor Radiometer Channel in the SpectralGrid object. - unsigned int numchan1=11; unsigned int refchan1=6; + size_t numchan1=11; size_t refchan1=6; Frequency reffreq1(182.11,"GHz"); Frequency chansep1( 0.04,"GHz"); Frequency intfreq1( 1.20,"GHz"); SidebandSide sidebandside1=LSB; SidebandType sidebandtype1=DSB; SpectralGrid alma_SpectralGrid(numchan1, refchan1, reffreq1, chansep1, intfreq1, sidebandside1, sidebandtype1); @@ -114,27 +114,27 @@ int main() RefractiveIndexProfile alma_RefractiveIndexProfile(alma_SpectralGrid, myProfile); - unsigned int numchan2=11; unsigned int refchan2=6; + size_t numchan2=11; size_t refchan2=6; Frequency reffreq2(179.11,"GHz"); Frequency chansep2( 0.09,"GHz"); Frequency intfreq2( 4.20,"GHz"); SidebandSide sidebandside2=LSB; SidebandType sidebandtype2=DSB; WVR_signalId.push_back(alma_RefractiveIndexProfile.getNumSpectralWindow()); // this will be the Id of the 1st spw of the 2nd pair alma_RefractiveIndexProfile.addNewSpectralWindow(numchan2, refchan2, reffreq2, chansep2, intfreq2, sidebandside2, sidebandtype2); - unsigned int numchan3=11; unsigned int refchan3=6; + size_t numchan3=11; size_t refchan3=6; Frequency reffreq3(175.51,"GHz"); Frequency chansep3( 0.10,"GHz"); Frequency intfreq3( 7.80,"GHz"); SidebandSide sidebandside3=LSB; SidebandType sidebandtype3=DSB; WVR_signalId.push_back(alma_RefractiveIndexProfile.getNumSpectralWindow()); alma_RefractiveIndexProfile.addNewSpectralWindow(numchan3, refchan3, reffreq3, chansep3, intfreq3, sidebandside3, sidebandtype3); Frequency mySingleFreq_astro2(467.75,"GHz"); Frequency chanSep_astro2(0.050,"GHz"); - unsigned int numChan_astro2=31; unsigned int refChan_astro2=16; + size_t numChan_astro2=31; size_t refChan_astro2=16; alma_RefractiveIndexProfile.addNewSpectralWindow(numChan_astro2, refChan_astro2, mySingleFreq_astro2, chanSep_astro2); - unsigned int astro_band=alma_RefractiveIndexProfile.getNumSpectralWindow()-1; + size_t astro_band=alma_RefractiveIndexProfile.getNumSpectralWindow()-1; - for(unsigned int j=0; j signalgain183; // Signal Side Band Gain of the WVR Channels (set to 50% below) double skyCoupling_1stGuess = 0.8; Temperature tspill(285.15,"K"); // Spillover Temperature see by the WVR - for(unsigned int i=0; i time; Angle aaa; FILE* fp; + #ifdef HAVE_WINDOWS + fp = fopen("WVR_MAUNA_KEA\\radiometer_data.dat", "r"); + #else fp = fopen("WVR_MAUNA_KEA/radiometer_data.dat", "r"); + #endif if (fp != 0) { char aRow[STRLEN+1]; char* token; vector v_tsky; - unsigned int numWVRChannels = 0; + size_t numWVRChannels = 0; char * fgrow = fgets( aRow, STRLEN, fp ); - unsigned int inilen=strlen(aRow); - unsigned int lacum=0; + size_t inilen=strlen(aRow); + size_t lacum=0; token = strtok(aRow,","); time.push_back(atof(token)); lacum=lacum+strlen(token)+1; token = 0; token = strtok(token,","); aaa=Angle(atof(token),"deg"); @@ -215,7 +219,7 @@ int main() if(strncmp(aRow," ",1)==0){ token = strtok(aRow,","); time.push_back(atof(token)); token = 0; token = strtok(token,","); aaa=Angle(atof(token),"deg"); - for(unsigned int j=0; j WVR_signalId; + vector WVR_signalId; - unsigned int numchan3=25; unsigned int refchan3=13; + size_t numchan3=25; size_t refchan3=13; Frequency reffreq3(182.01,"GHz"); Frequency chansep3( 0.02,"GHz"); Frequency intfreq3( 1.30,"GHz"); SidebandSide sidebandside3=LSB; SidebandType sidebandtype3=DSB; SpectralGrid apex_SpectralGrid(numchan3, refchan3, reffreq3, chansep3, intfreq3, sidebandside3, sidebandtype3); @@ -103,13 +103,13 @@ int main() - unsigned int numchan4=25; unsigned int refchan4=13; + size_t numchan4=25; size_t refchan4=13; Frequency reffreq4(179.11,"GHz"); Frequency chansep4( 0.04,"GHz"); Frequency intfreq4( 4.20,"GHz"); SidebandSide sidebandside4=LSB; SidebandType sidebandtype4=DSB; WVR_signalId.push_back(apex_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 2nd pair (WVR channel 2) apex_RefractiveIndexProfile.addNewSpectralWindow(numchan4, refchan4, reffreq4, chansep4, intfreq4, sidebandside4, sidebandtype4); - unsigned int numchan5=25; unsigned int refchan5=13; + size_t numchan5=25; size_t refchan5=13; Frequency reffreq5(176.81,"GHz"); Frequency chansep5( 0.04,"GHz"); Frequency intfreq5( 6.50,"GHz"); SidebandSide sidebandside5=LSB; SidebandType sidebandtype5=DSB; WVR_signalId.push_back(apex_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 3rd pair (WVR channel 3) @@ -117,7 +117,7 @@ int main() - for(unsigned int j=0; j skycouplingastro; // Sky couplings the astro channel taken as WWR vector signalgainastro; // Signal Side Band Gain of the astro channel taken as WWR - for(unsigned int i=0; i<1; i++){ + for(size_t i=0; i<1; i++){ skycouplingastro.push_back(0.95); signalgainastro.push_back(Percent(95.0,"%")); // 50% } @@ -158,7 +158,7 @@ int main() - for(unsigned int i=0; i v_tsky; - unsigned int numWVRChannels = 0; + size_t numWVRChannels = 0; char * fgrow = fgets( aRow, STRLEN, fp ); - unsigned int inilen=strlen(aRow); - unsigned int lacum=0; + size_t inilen=strlen(aRow); + size_t lacum=0; token = strtok(aRow,","); lacum=lacum+strlen(token)+1; time_mjd.push_back(atof(token)); @@ -261,7 +265,7 @@ int main() token = 0; token = strtok(token,","); lacum=lacum+strlen(token)+1; astrowater.push_back(Length(atof(token),"mm")); token = 0; token = strtok(token,","); lacum=lacum+strlen(token)+1; wvrwater.push_back(Length(atof(token),"mm")); - for(unsigned int j=0; j WVRASTRO_signalId; + vector WVRASTRO_signalId; WVRASTRO_signalId.push_back(apex_SkyStatus.getNumSpectralWindow()-2); WaterVaporRadiometer wvr_astro(WVRASTRO_signalId,skycouplingastro,signalgainastro,groundtemp[i]); Angle astroelevation(RadiometerData[i].getElevation().get("rad")-(7.8/180.0)*3.1415927,"rad"); @@ -335,7 +339,7 @@ int main() apex_SkyStatus.setWaterVaporRadiometer(wvr_astro); - unsigned int measurementNumber=0; + size_t measurementNumber=0; apex_SkyStatus.WaterVaporRetrieval_fromWVR(astroRadiometerData,measurementNumber); diff --git a/src/test/AtmBasicTest.cpp b/src/test/AtmBasicTest.cpp index b0bf65f..aff242f 100644 --- a/src/test/AtmBasicTest.cpp +++ b/src/test/AtmBasicTest.cpp @@ -51,7 +51,7 @@ int main() { // Initialize the Atmospheric model - unsigned int atmType = 1; // 1=tropical (ALMA site), 2=midlatSummer, 3=midlatWinter + size_t atmType = 1; // 1=tropical (ALMA site), 2=midlatSummer, 3=midlatWinter atm::Temperature T(273. ,"K" ); // Ground temperature atm::Pressure P(55000. ,"Pa"); // Ground Pressure atm::Humidity H(8.,"%" ); // Ground Relative Humidity (indication) @@ -89,12 +89,12 @@ int main() double bandWidthAstro = 2.*1.e9; double chanWidthAstro = 0.1*1e9; // 100Mhz - unsigned int numChanAstro=int(bandWidthAstro/chanWidthAstro); - unsigned int refChanAstro=numChanAstro/2+1; + size_t numChanAstro=int(bandWidthAstro/chanWidthAstro); + size_t refChanAstro=numChanAstro/2+1; - atm::SpectralGrid * spGrid_p = new atm::SpectralGrid(numChanAstro, // unsigned int numChan - refChanAstro, // unsigned int refChan + atm::SpectralGrid * spGrid_p = new atm::SpectralGrid(numChanAstro, // size_t numChan + refChanAstro, // size_t refChan atm::Frequency(refFreqAstro), // Frequency refFreq atm::Frequency(chanWidthAstro)); @@ -103,7 +103,7 @@ int main() // Print description of spectral windows // cout<<"-----------------------------------------------"<getNumSpectralWindow(); j++){ + for(size_t j=0; jgetNumSpectralWindow(); j++){ cout << "Spectral Window " << j // << " Central Frequency: " << spGrid_p->getRefFreq(j).get("GHz") << " GHz, " << " Central Frequency: " << spGrid_p->getChanFreq(j,(spGrid_p->getNumChan(j)/2)).get("GHz") << " GHz, " @@ -111,7 +111,7 @@ int main() << " LO frequency: " << spGrid_p->getLoFrequency(j)/1.e9 << " GHz, " << " Num. of channels: " << spGrid_p->getNumChan(j)<getNumChan(j);i++) + // for (size_t i=0;igetNumChan(j);i++) // cout<getChanFreq(j,i).get("GHz")<<" "; // cout<.getNumLayer() of the Class AtmProfile. * - Lists different physical and chemical parameters layer by layer, using operators such as - * .getLayerWaterVaporMassDensity(unsigned int i) of the Class AtmProfile. + * .getLayerWaterVaporMassDensity(size_t i) of the Class AtmProfile. * * The ouput of this test should be as follows: * @@ -94,7 +94,7 @@ int main() // double h_div_k=0.04799274551; // plank/boltz in units of K/GHz // Atmospheretype atmType = tropical; // Atmospheric type (to reproduce behavior above the tropopause) - unsigned int atmType = 1; // TROPICAL + size_t atmType = 1; // TROPICAL Temperature T( 270.0,"K" ); // Ground temperature Pressure P( 560.0,"mb"); // Ground Pressure Humidity H( 20.0,"%" ); // Ground Relative Humidity (indication) @@ -130,7 +130,7 @@ int main() cout<<" AtmProfileTest: Layer parameters: " < WVR_signalId; + vector WVR_signalId; - unsigned int numchan0=25; unsigned int refchan0=13; + size_t numchan0=25; size_t refchan0=13; Frequency reffreq0(183.310-5.225,"GHz"); Frequency chansep0(2.650/25.0,"GHz"); Frequency intfreq0(0,"GHz"); // SidebandSide sidebandside0=LSB; SidebandType sidebandtype0=SSB; SpectralGrid sma_SpectralGrid(numchan0, refchan0, reffreq0, chansep0); //, intfreq0, sidebandside0, sidebandtype0); @@ -101,50 +101,50 @@ int main() // windows directly at the level of this RefractiveIndexProfile object. RefractiveIndexProfile sma_RefractiveIndexProfile(sma_SpectralGrid, sma_AtmProfile); - unsigned int numchan1=25; unsigned int refchan1=13; + size_t numchan1=25; size_t refchan1=13; Frequency reffreq1(183.310-3.18,"GHz"); Frequency chansep1(1.400/25.0,"GHz"); Frequency intfreq1(0,"GHz"); // SidebandSide sidebandside1=LSB; SidebandType sidebandtype1=SSB; WVR_signalId.push_back(sma_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 2nd pair (WVR channel 2) sma_RefractiveIndexProfile.addNewSpectralWindow(numchan1, refchan1, reffreq1, chansep1); //, intfreq1, sidebandside1, sidebandtype1); - unsigned int numchan2=25; unsigned int refchan2=13; + size_t numchan2=25; size_t refchan2=13; Frequency reffreq2(183.310-1.9475,"GHz"); Frequency chansep2(0.845/25.0,"GHz"); Frequency intfreq2(0,"GHz"); // SidebandSide sidebandside2=LSB; SidebandType sidebandtype2=SSB; WVR_signalId.push_back(sma_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 3rd pair (WVR channel 3) sma_RefractiveIndexProfile.addNewSpectralWindow(numchan2, refchan2, reffreq2, chansep2); //, intfreq2, sidebandside2, sidebandtype2); - unsigned int numchan3=25; unsigned int refchan3=13; + size_t numchan3=25; size_t refchan3=13; Frequency reffreq3(183.310-0.882,"GHz"); Frequency chansep3(0.206/25.0,"GHz"); Frequency intfreq3(0,"GHz"); // SidebandSide sidebandside3=LSB; SidebandType sidebandtype3=SSB; WVR_signalId.push_back(sma_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 3rd pair (WVR channel 3) sma_RefractiveIndexProfile.addNewSpectralWindow(numchan3, refchan3, reffreq3, chansep3); //, intfreq3, sidebandside3, sidebandtype3); - unsigned int numchan4=25; unsigned int refchan4=13; + size_t numchan4=25; size_t refchan4=13; Frequency reffreq4(183.310+0.882,"GHz"); Frequency chansep4(0.206/25.0,"GHz"); Frequency intfreq4(0,"GHz"); // SidebandSide sidebandside3=LSB; SidebandType sidebandtype3=SSB; WVR_signalId.push_back(sma_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 3rd pair (WVR channel 3) sma_RefractiveIndexProfile.addNewSpectralWindow(numchan4, refchan4, reffreq4, chansep4); //, intfreq3, sidebandside3, sidebandtype3); - unsigned int numchan5=25; unsigned int refchan5=13; + size_t numchan5=25; size_t refchan5=13; Frequency reffreq5(183.310+1.9475,"GHz"); Frequency chansep5(0.845/25.0,"GHz"); Frequency intfreq5(0,"GHz"); // SidebandSide sidebandside2=LSB; SidebandType sidebandtype2=SSB; WVR_signalId.push_back(sma_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 3rd pair (WVR channel 3) sma_RefractiveIndexProfile.addNewSpectralWindow(numchan5, refchan5, reffreq5, chansep5); //, intfreq2, sidebandside2, sidebandtype2); - unsigned int numchan6=25; unsigned int refchan6=13; + size_t numchan6=25; size_t refchan6=13; Frequency reffreq6(183.310+3.18,"GHz"); Frequency chansep6(1.400/25.0,"GHz"); Frequency intfreq6(0,"GHz"); // SidebandSide sidebandside1=LSB; SidebandType sidebandtype1=SSB; WVR_signalId.push_back(sma_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 2nd pair (WVR channel 2) sma_RefractiveIndexProfile.addNewSpectralWindow(numchan6, refchan6, reffreq6, chansep6); //, intfreq1, sidebandside1, sidebandtype1); - unsigned int numchan7=25; unsigned int refchan7=13; + size_t numchan7=25; size_t refchan7=13; Frequency reffreq7(183.310+5.225,"GHz"); Frequency chansep7(2.650/25.0,"GHz"); Frequency intfreq7(0,"GHz"); // SidebandSide sidebandside1=LSB; SidebandType sidebandtype1=SSB; WVR_signalId.push_back(sma_RefractiveIndexProfile.getNumSpectralWindow()); // this is the Id of the 1st spectral window of the 2nd pair (WVR channel 2) sma_RefractiveIndexProfile.addNewSpectralWindow(numchan7, refchan7, reffreq7, chansep7); //, intfreq1, sidebandside1, sidebandtype1); - for(unsigned int j=0; j skycouplingastro; // Sky couplings the astro channel taken as WWR vector signalgainastro; // Signal Side Band Gain of the astro channel taken as WWR - for(unsigned int i=0; i<1; i++){ + for(size_t i=0; i<1; i++){ skycouplingastro.push_back(1.0); signalgainastro.push_back(Percent(50.0,"%")); } @@ -185,7 +185,7 @@ int main() - for(unsigned int i=0; i v_tsky; - unsigned int numWVRChannels = 0; + size_t numWVRChannels = 0; char * fgrow = fgets( aRow, STRLEN, fp ); - unsigned int inilen=strlen(aRow); - unsigned int lacum=0; + size_t inilen=strlen(aRow); + size_t lacum=0; token = strtok(aRow,","); lacum=lacum+strlen(token)+1; time_mjd.push_back(atof(token)); token = 0; token = strtok(token,","); lacum=lacum+strlen(token)+1; aaa=Angle(atof(token),"rad"); elevation.push_back(aaa); @@ -276,7 +280,7 @@ int main() token = 0; token = strtok(token,","); aaa=Angle(atof(token),"rad"); elevation.push_back(aaa); token = 0; token = strtok(token,","); - for(unsigned int j=0; j v_ProfileHeightLevels; vector v_ProfileWaterVaporLevels; FILE* fp; + #ifdef HAVE_WINDOWS + fp = fopen("T-INVERSION\\invt.dat", "r"); + #else fp = fopen("T-INVERSION/invt.dat", "r"); + #endif if (fp != 0) { char aRow[STRLEN+1]; char* token; @@ -199,7 +203,7 @@ int main() // Atmospheretype atmType = tropical; // Atmospheric type (to reproduce behavior above the tropopause) - unsigned int atmType = 1; // TROPICAL + size_t atmType = 1; // TROPICAL Temperature T(265.54,"K" ); // Ground temperature Pressure P( 560.0,"mb"); // Ground Pressure Humidity H( 20.0,"%" ); // Ground Relative Humidity (indication) @@ -246,7 +250,7 @@ int main() cout.setf(ios::fixed, ios::floatfield); cout.precision(4); - for(unsigned int i=0; iSpectralGrid * - Initializes that pointer with a first object created with the this constructor. * - The pointer has then one element . On this element, several things are checked using the following operators of the class: - * getRefFreq(unsigned int spwId), - * getChanSep(unsigned int spwId), + * getRefFreq(size_t spwId), + * getChanSep(size_t spwId), * getNumSpectralWindow(), and - * getNumChan(unsigned int spwId). + * getNumChan(size_t spwId). * - An rrror message is expected when trying getNumChan(1) because there is no spectral window number 1. - * - Finally, the operators isRegular(unsigned int spwId), - * and getAssocSpwId(unsigned int spwId) are tested. + * - Finally, the operators isRegular(size_t spwId), + * and getAssocSpwId(size_t spwId) are tested. * * The ouput of this test should be as follows: * * * SpectralGridTest: Test 1:
- * SpectralGridTest: Create a pointer with first element construted with SpectralGrid(usigned int numChan, unsigned int refChan, Frequency refFreq, Frequency chanSep):
+ * SpectralGridTest: Create a pointer with first element construted with SpectralGrid(usigned int numChan, size_t refChan, Frequency refFreq, Frequency chanSep):
* SpectralGridTest: Number of channels retrieved: 64 (Value entered to constructor:64)
* SpectralGridTest: Reference frequency retrieved: 9e+10 Hz; SpectralGridTest: Input:90 GHz
* SpectralGridTest: Reference frequency retrieved: 90GHz SpectralGridTest: Input:90 GHz
@@ -70,7 +70,7 @@ using namespace atm; * * Test 2 starts from the pointer created in Test 1: * - A new spectral window is added with 128 channels, channel number 32 as the reference channel, reference frequency at 215 GHz, and regular channel separation of 0.02 GHz. - * This new spectral window is added using add(unsigned int numChan, unsigned int refChan, Frequency refFreq, Frequency chanSep) + * This new spectral window is added using add(size_t numChan, size_t refChan, Frequency refFreq, Frequency chanSep) * - The next step is to verify that nothing has change for spectral window number 0 from Test 1. * - Finally, spectral window number 1 is tested similarly to spectral window #0. * - It is also checked that spectral windows with numbers > 1 do not exist. @@ -79,7 +79,7 @@ using namespace atm; * * * SpectralGridTest: Test 2
- * SpectralGridTest: New spectral window using add(unsigned int numChan, unsigned int refChan, Frequency refFreq, Frequency chanSep):
+ * SpectralGridTest: New spectral window using add(size_t numChan, size_t refChan, Frequency refFreq, Frequency chanSep):
* SpectralGridTest: A new spectral window has been appended and got the identifier number:1
* SpectralGridTest: Number of spectral windows: 2
* SpectralGridTest: Number of channels retrieved for spwId 0: 64
@@ -101,8 +101,8 @@ int main() { - unsigned int numChan = 64; - unsigned int refChan = 32; + size_t numChan = 64; + size_t refChan = 32; Frequency myRefFreq(90.0,"GHz"); Frequency myChanSep(0.01,"GHz"); @@ -110,7 +110,7 @@ int main() SpectralGrid* sgPtr1; cout << " SpectralGridTest: Test 1:" <getNumChan() << " (Value entered to constructor:" << numChan << ")" << endl; cout << " SpectralGridTest: Reference frequency retrieved: " @@ -149,12 +149,12 @@ int main() cout << " SpectralGridTest: Test 2" << endl; - cout << " SpectralGridTest: New spectral window using add(unsigned int numChan, unsigned int refChan, Frequency refFreq, Frequency chanSep):" << endl; - unsigned int numChan1 = 128; - unsigned int refChan1 = 32; + cout << " SpectralGridTest: New spectral window using add(size_t numChan, size_t refChan, Frequency refFreq, Frequency chanSep):" << endl; + size_t numChan1 = 128; + size_t refChan1 = 32; Frequency myNewRefFreq(215.0,"GHz"); Frequency myNewChanSep(0.02,"GHz"); - unsigned int spwId = sgPtr1->add( numChan1, refChan1, myNewRefFreq, myNewChanSep); + size_t spwId = sgPtr1->add( numChan1, refChan1, myNewRefFreq, myNewChanSep); cout << " SpectralGridTest: A new spectral window has been appended and got the identifier number:" << spwId << endl; cout << " SpectralGridTest: Number of spectral windows: " << sgPtr1->getNumSpectralWindow() << endl; @@ -187,7 +187,7 @@ int main() if(sgPtr1->getSideband(spwId).size()==0) cout << " SpectralGridTest: As expected this spectral window with spwid="<getSideband(id).size()==0) cout << " SpectralGridTest: Spectral window with id="<getNumChan()]; // one dynamic alloc + size_t nch = sgPtr1->getNumChan(); + double * chFreq = new double[nch]; // one dynamic alloc vector chanFreq; - chanFreq.reserve(sgPtr1->getNumChan()); // a more versatil dynamic alloc (allowing eg resizing) + chanFreq.reserve(nch); // a more versatil dynamic alloc (allowing eg resizing) - for(int i=0; i<(int)sgPtr1->getNumChan(); i++){ - chanFreq[i] = sgPtr1->getChanFreq(i).get(); + for(size_t i=0; igetChanFreq(i); + chanFreq[i] = freq.get(); chFreq[i] = chanFreq[i]; - cout << "SpectralGridTest: " << i << " channel: " << i-(int)refChan+1 << " freq: " << chanFreq[i] << endl; + cout << "SpectralGridTest: " << i << " channel: " << i - refChan + 1 << " freq: " << chanFreq[i] << endl; } cout << endl; @@ -219,7 +221,7 @@ int main() SpectralGrid* sgPtr2; cout << " SpectralGridTest: Test 2:" <getNumChan() << " Input: " << numChan << endl; cout << " SpectralGridTest: Reference frequency retrieved:" << sgPtr2->getRefFreq().get() << "Hz Initial: none" << endl; @@ -232,8 +234,9 @@ int main() }else{ cout << " SpectralGridTest: the first spectral window with id 0 is not regularily sampled" << endl; } - chFreq[sgPtr2->getNumChan()/4]=chFreq[sgPtr2->getNumChan()/4]+1.; - cout << " SpectralGridTest: Add a second irregular spectral window using add( unsigned int numChan, unsigned int refChan, double* chFreq, string units):" << endl; + size_t nch2 = sgPtr2->getNumChan(); + chFreq[nch2 / 4] = chFreq[nch2 / 4] + 1.; + cout << " SpectralGridTest: Add a second irregular spectral window using add( size_t numChan, size_t refChan, double* chFreq, string units):" << endl; sgPtr2->add( numChan, refChan, chFreq, "Hz"); if(sgPtr2->isRegular()){ cout << " SpectralGridTest: the first spectral window with id 0 is regularily sampled as expected" << endl; @@ -253,7 +256,7 @@ int main() SpectralGrid* sgPtr3; cout << " SpectralGridTest: Test 3:" << endl; - cout << " SpectralGridTest: Build using SpectralGrid( unsigned int numChan, double refFreq, double* chFreq, string freqUnits):" << endl; + cout << " SpectralGridTest: Build using SpectralGrid( size_t numChan, double refFreq, double* chFreq, string freqUnits):" << endl; sgPtr3 = new SpectralGrid( numChan, refFreq, chFreq, "Hz"); cout << " SpectralGridTest: Number of channels retrieved: " << sgPtr3->getNumChan() << " Input: " << numChan << endl; cout << " SpectralGridTest: Reference frequency retrieved:" << sgPtr3->getRefFreq().get() << "Hz Initial:" << refFreq << "Hz" << endl; @@ -272,6 +275,7 @@ int main() cout << " SpectralGridTest: Frequency range: from "<< sgPtr3->getMinFreq().get() <<" to "<< sgPtr3->getMaxFreq().get() <<"Hz"<< endl; cout << " SpectralGridTest: Frequency range: from "<< sgPtr3->getMinFreq().get("GHz") <<" to "<< sgPtr3->getMaxFreq().get("GHz") <<"GHz"<< endl; + delete[] chFreq; delete sgPtr3; cout << endl; @@ -291,7 +295,7 @@ int main() cout << " SpectralGridTest: Number of spectral windows: " << sgPtr1->getNumSpectralWindow() << " Expected: 2" << endl; - for(unsigned int spwId=0; spwIdgetNumSpectralWindow(); spwId++){ + for(size_t spwId=0; spwIdgetNumSpectralWindow(); spwId++){ cout << " SpectralGridTest: Sideband: " << sgPtr1->getSideband(spwId) << endl; cout << " SpectralGridTest: LO frequency: " << sgPtr1->getLoFrequency(spwId) << "Hz " << endl; cout << " SpectralGridTest: Number of channels retrieved: " << sgPtr1->getNumChan(spwId) << " for spwId " << spwId<<": " @@ -320,13 +324,13 @@ int main() if(sgPtr1->getAssocSpwId(spwId).size()==0){ cout << " SpectralGridTest: the spectral window with id "<< spwId <<" has no associated spectral window" << endl; }else{ - for(unsigned int n=0; ngetAssocSpwId(spwId).size(); n++){ - unsigned int assocSpwId = sgPtr1->getAssocSpwId(spwId)[n]; + for(size_t n=0; ngetAssocSpwId(spwId).size(); n++){ + size_t assocSpwId = sgPtr1->getAssocSpwId(spwId)[n]; cout << " SpectralGridTest: the spectral window with id "<< spwId << " has the associated spec. win. with id " << assocSpwId << " (" << sgPtr1->getAssocNature(spwId)[n] << ")" << endl; - for(unsigned int i=0; igetNumChan(spwId); i++){ + for(size_t i=0; igetNumChan(spwId); i++){ cout << " SpectralGridTest: chan index:" << i << " " << sgPtr1->getSideband(spwId) <<" "<getChanFreq(spwId,i).get("GHz")<<"GHz " << sgPtr1->getAssocNature(spwId)[n] <<" "<getChanFreq(assocSpwId,i).get("GHz")<<"GHz"<getNumSpectralWindow(); j++){ + for(size_t j=0; jgetNumSpectralWindow(); j++){ cout << "Spectral Window " << j << " Reference Frequency: " << spGrid_p->getRefFreq(j).get("GHz") << " GHz, " << " Reference Channel: " << spGrid_p->getRefChan(j) @@ -119,7 +119,7 @@ int main() << " "<getChanFreq(j,numChanAstro-1).get() <getNumChan(j);i++) + // for (size_t i=0;igetNumChan(j);i++) // cout<getChanFreq(j,i).get("GHz")<<" "; // cout<getChanFreq(spwid,i).get()<<" "<