Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/MISR_simulator.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/MISR_simulator.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/MISR_simulator.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2009, Roger Marchand, version 1.2
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Modified for COSPv2.0
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/array_lib.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/array_lib.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/array_lib.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,10 +26,10 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! 10/16/03  John Haynes   - Original version (haynes@atmos.colostate.edu)
 ! 01/31/06  John Haynes   - IDL to Fortran 90
 ! 01/01/15  Dustin Swales - Modified for COSPv2.0
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 module array_lib
@@ -47,5 +47,5 @@
     !   Finds the index of an array that is closest to a value, plus the
     !   difference between the value found and the value specified
-    !
+
     ! Inputs:
     !   [list]   an array of sequential values
@@ -53,14 +53,14 @@
     ! Optional input:
     !   [sort]   set to 1 if [list] is in unknown/non-sequential order
-    !
+
     ! Returns:
     !   index of [list] that is closest to [val]
-    !
+
     ! Optional output:
     !   [dist]   set to variable containing [list([result])] - [val]
-    !
+
     ! Requires:
     !   mrgrnk library
-    !
+
     ! ##########################################################################
 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -26,10 +26,10 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! May 2015- D. Swales - Original version
 ! Mar 2018- R. Guzman - Added OPAQ diagnostics and GLID simulator
 ! Apr 2018- R. Guzman - Added ATLID simulator
-!
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_atlid_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_atlid_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_atlid_interface.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! Apr 2018 - R. Guzman - Original version
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_calipso_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_calipso_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_calipso_interface.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Original version
@@ -69,5 +69,5 @@
     ! derived from CALIPSO-GOCCP observations at 120m vertical grid 
     ! (Cesana and Chepfer, JGR, 2013).
-    !
+
     ! Relationship between ATBice and ATBperp,ice for ice particles:
     !                ATBperp,ice = Alpha*ATBice 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_cloudsat_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_cloudsat_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_cloudsat_interface.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Original version
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_config.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_config.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_config.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! Jul 2007 - A. Bodas-Salcedo - Initial version
@@ -39,5 +39,5 @@
 ! Mar 2018 - R. Guzman        - Added LIDAR_NTYPE for the OPAQ diagnostics
 ! Apr 2018 - R. Guzman        - Added parameters for GROUND LIDAR and ATLID simulators
-!
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_errorHandling.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_errorHandling.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_errorHandling.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,8 +26,8 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! May 2015- D. Swales - Original version
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_grLidar532_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_grLidar532_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_grLidar532_interface.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! Apr 2018 - R. Guzman - Original version
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_isccp_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_isccp_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_isccp_interface.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Original version
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_kinds.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_kinds.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_kinds.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -26,8 +26,8 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! May 2015- D. Swales - Original version
-!
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 MODULE cosp_kinds
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_misr_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_misr_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_misr_interface.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Original version
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_modis_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_modis_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_modis_interface.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Original version
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_optics.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_optics.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_optics.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,10 +26,10 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! 05/01/15  Dustin Swales - Original version
 ! 04/04/18  Rodrigo Guzman- Added CALIOP-like Ground LIDar routines (GLID)
 ! 10/04/18  Rodrigo Guzman- Added ATLID-like (EarthCare) lidar routines (ATLID)
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 module cosp_optics
@@ -50,5 +50,5 @@
   ! ##########################################################################
   !                          COSP_SIMULATOR_OPTICS
-  !
+
   ! Used by: ISCCP, MISR and MODIS simulators
   ! ##########################################################################
@@ -107,5 +107,5 @@
   ! ##############################################################################
   !                           MODIS_OPTICS_PARTITION
-  !
+
   ! For the MODIS simulator, there are times when only a sinlge optical depth
   ! profile, cloud-ice and cloud-water are provided. In this case, the optical
@@ -154,5 +154,5 @@
   ! ########################################################################################
   !                                   MODIS_OPTICS
-  ! 
+
   ! ########################################################################################
   subroutine modis_optics(nPoints,nLevels,nSubCols,tauLIQ,sizeLIQ,tauICE,sizeICE,fracLIQ, g, w0)
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_parasol_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_parasol_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_parasol_interface.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Original version
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_phys_constants.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_phys_constants.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_phys_constants.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -26,8 +26,8 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! May 2015- D. Swales - Original version
-!
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 MODULE cosp_phys_constants
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_stats.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_stats.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_stats.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! Jul 2007 - A. Bodas-Salcedo - Initial version
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_utils.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_utils.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_utils.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,9 +26,9 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! Jul 2007 - A. Bodas-Salcedo - Initial version
 ! May 2015 - Dustin Swales    - Modified for COSPv2.0
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 MODULE MOD_COSP_UTILS
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/icarus.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/icarus.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/icarus.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2009, Lawrence Livemore National Security Limited Liability
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Modified for COSPv2.0
@@ -251,5 +251,5 @@
        ! ############################################################################
        !                        Clear-sky radiance calculation
-       !       
+
        ! Compute water vapor continuum emissivity this treatment follows Schwarkzopf 
        ! and Ramasamy JGR 1999,vol 104, pages 9467-9499. The emissivity is calculated
@@ -329,5 +329,5 @@
        ! #################################################################################  
        !                            Cloud-Top Temperature
-       !
+
        ! Now that you have the top of atmosphere radiance, account for ISCCP 
        ! procedures to determine cloud top temperature account for partially
@@ -392,5 +392,5 @@
     ! ####################################################################################
     !                           Cloud-Top Pressure
-    !
+
     ! The 2 methods differ according to whether or not you use the physical cloud
     ! top pressure (isccp_top_height = 2) or the radiatively determined cloud top
@@ -516,5 +516,5 @@
     ! ####################################################################################
     !                 Determines ISCCP cloud type frequencies
-    !
+
     ! Now that boxptop and boxtau have been determined, determine amount of each of the 
     ! 49 ISCCP cloud types. Also compute grid box mean cloud top pressure and 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lidar_simulator.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lidar_simulator.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lidar_simulator.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2009, Centre National de la Recherche Scientifique
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,19 +26,19 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2007: ActSim code of M. Chiriaco and H. Chepfer rewritten by S. Bony
-!
+
 ! May 2008, H. Chepfer:
 ! - Units of pressure inputs: Pa 
 ! - Non Spherical particles : LS Ice NS coefficients, CONV Ice NS coefficients
 ! - New input: ice_type (0=ice-spheres ; 1=ice-non-spherical)
-!
+
 ! June 2008, A. Bodas-Salcedo:
 ! - Ported to Fortran 90 and optimisation changes
-!
+
 ! August 2008, J-L Dufresne:
 ! - Optimisation changes (sum instructions suppressed)
-!
+
 ! October 2008, S. Bony,  H. Chepfer and J-L. Dufresne :  
 ! - Interface with COSP v2.0:
@@ -47,16 +47,16 @@
 !      depolarisation diagnostic removed
 !      parasol (polder) reflectances (for 5 different solar zenith angles) added
-!
+
 ! December 2008, S. Bony,  H. Chepfer and J-L. Dufresne : 
 ! - Modification of the integration of the lidar equation.
 ! - change the cloud detection threshold
-!
+
 ! April 2008, A. Bodas-Salcedo:
 ! - Bug fix in computation of pmol and pnorm of upper layer
-!
+
 ! April 2008, J-L. Dufresne
 ! - Bug fix in computation of pmol and pnorm, thanks to Masaki Satoh: a factor 2 
 ! was missing. This affects the ATB values but not the cloud fraction. 
-!
+
 ! January 2013, G. Cesana and H. Chepfer:
 ! - Add the perpendicular component of the backscattered signal (pnorm_perp_tot) in the arguments
@@ -65,10 +65,10 @@
 ! Reference: Cesana G. and H. Chepfer (2013): Evaluation of the cloud water phase
 ! in a climate model using CALIPSO-GOCCP, J. Geophys. Res., doi: 10.1002/jgrd.50376
-!
+
 ! May 2015 - D. Swales - Modified for COSPv2.0
-!
+
 ! Mar 2018 - R. Guzman - Added OPAQ subroutines
 ! References OPAQ:
-!
+
 !       Guzman et al. (2017): Direct atmosphere opacity observations from CALIPSO provide 
 ! new constraints on cloud-radiation interactions. JGR-Atmospheres, DOI: 10.1002/2016JD025946
@@ -76,5 +76,5 @@
 ! the altitude at which a spaceborne lidar beam is fully attenuated. AMT, 10, 4659-4685,
 ! https://doi.org/10.5194/amt-10-4659-2017
-!
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 module mod_lidar_simulator
@@ -90,5 +90,5 @@
   ! derived from CALIPSO-GOCCP observations at 120m vertical grid 
   ! (Cesana and Chepfer, JGR, 2013).
-  !
+
   ! Relationship between ATBice and ATBperp,ice for ice particles:
   !                ATBperp,ice = Alpha*ATBice 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_construct_destroy_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_construct_destroy_mod.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_construct_destroy_mod.F90	(revision 5099)
@@ -1,6 +1,6 @@
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! Module pour construir et detruire les variables "cospIN", "cospstateIN" et "cospOUT"
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -118,5 +118,5 @@
   ! ######################################################################################
   ! SUBROUTINE construct_cosp_outputs
-  !
+
   ! This subroutine allocates output fields based on input logical flag switches.
   ! ######################################################################################  
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_interface.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_interface.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_interface.F90	(revision 5099)
@@ -1,4 +1,4 @@
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! Nouveau code d'interface entre LMDZ et COSPv2 (version 2)
 ! L'ancienne interface s'appelait "phys_cosp2" et avait ete concue pour COSPv1.4.
@@ -9,8 +9,8 @@
 ! Cette version de COSP propose aussi de nombreux nouveaux diagnostics, notamment pour
 ! le simulateur lidar (diagnostics CALIPSO-OPAQ, lidar sol 532nm et lidar ATLID 355nm).
-!
+
 ! Interface reecrite par R.Guzman (01/2019), a partir de l'interface initiale concue
 ! et ecrite par A.Idelkadi 
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 !  subroutine phys_cosp2( itap,dtime,freq_cosp, &
@@ -87,7 +87,7 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! Declaration des variables 
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -211,7 +211,7 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 1) Lecture du fichier "cosp_input_nl.txt", parametres d'entree pour COSP
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -356,7 +356,7 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 3) Calculs des champs d'entree COSP a partir des variables LMDZ
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -427,8 +427,8 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 4a) On construit la variable cospOUT qui contient tous les diagnostics de sortie.
 ! Elle sera remplie lors de l'appel du simulateur COSP
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -437,8 +437,8 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 4b) On construit la variable cospstateIN que l'on va remplir avec les champs LMDZ
 ! Les champ verticaux doivent etre donnes a l'envers, c-a-d : (Nlevels:1) = (TOA:SFC)
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -463,10 +463,10 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 4c) On construit la variable cospIN qui contient les proprietes optiques subcolumn
 ! pour COSP. Elle sera essentiellement remplie dans la subroutine subsample_and_optics
 ! ou sont appeles SCOPS, PREC_SCOPS et les subroutines qui calculent les signaux
 ! simules pour chaque simulateur actif.
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -477,8 +477,8 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 5) Appel de subsample_and_optics : Les champs verticaux doivent etre donnes a
 ! l'envers comme pour le remplissage de cospstateIN, c-a-d : (Nlevels:1) = (TOA:SFC)
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -503,7 +503,7 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 6) On appelle le simulateur COSPv2 
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -516,10 +516,10 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 7a) Ecriture des sorties 1: on cree d'abord les fichiers NCDF pour ecrire les sorties
 ! en appelant lmdz_cosp_output_open (lors du premier appel de cette interface pour les
 ! 2 options d'ecriture), ou sont definis les axes et les caracteristiques
 ! des fichiers de sortie avec les diagnostics.
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -541,14 +541,14 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 7b) Ecriture des sorties 2: le remplissage des fichiers de sortie se fait a chaque
 ! appel de cette interface avec une difference entre les 2 options d'ecriture:
-!
+
 ! AVEC xios, on commence a remplir les fichiers de sortie a partir du DEUXIEME
 ! appel de cette interface (lorsque cosp_init_flag = 1).
-!
+
 ! SANS xios, on commence a remplir les fichiers de sortie a partir du PREMIER
 ! appel de cette interface (lorsque cosp_init_flag = 1).
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -558,7 +558,7 @@
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! 8) On libere la memoire allouee lors de cet appel a l'interface
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_mod.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_mod.F90	(revision 5099)
@@ -3,9 +3,9 @@
 !! La routine cosp_output_open (appelee 1 seule fois dans phy_cosp.F90) permet :
 !! de creer les fichiers avec leurs grilles horizontales et verticales
-!
+
 ! R.Guzman jan 2019 (mise a jour pour COSPv2)
 ! On change le nom du module a "lmdz_cosp_output_mod" et celui de la routine a "lmdz_cosp_output_open"
 ! pour qu'on sache qu'il s'agit d'un module specifique a l'implementation de COSP dans LMDZ
-!
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   MODULE lmdz_cosp_output_mod
@@ -347,5 +347,5 @@
 !!! Variables d'entree
 
-  ! ug Variables utilisées pour récupérer le calendrier pour xios
+  ! ug Variables utilis�es pour r�cup�rer le calendrier pour xios
   INTEGER :: x_an, x_mois, x_jour
   REAL :: x_heure
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90	(revision 5099)
@@ -1,9 +1,9 @@
 !!!! Abderrahmane Idelkadi aout 2013 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Module pour definir (au 1er appel) et ecrire les variables dans les fichiers de sortie cosp
-!
+
 ! R.Guzman jan 2019 (mise a jour pour COSPv2)
 ! On change le nom du module a "lmdz_cosp_output_write_mod" et celui de la routine a "lmdz_cosp_output_write"
 ! pour qu on sache qu il s agit d un module specifique a l implementation de COSP dans LMDZ
-!
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    MODULE lmdz_cosp_output_write_mod
@@ -669,6 +669,6 @@
     CHARACTER(LEN=20) :: typeecrit
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -765,6 +765,6 @@
       END IF
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -827,9 +827,9 @@
     IF (prt_level >= 9) WRITE(lunout,*)'Begin histrwrite2d ',var%name
 
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
 !$OMP MASTER
       print*,'var, cosp_varsdefined dans cosp_varsdefined ',var%name, cosp_varsdefined
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
       CALL conf_cospoutputs(var%name,var%cles)
       DO iff=1, 3
@@ -840,5 +840,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field)/=klon) &
   CALL abort_physic('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
@@ -921,7 +921,7 @@
                nom=var%name
       END IF
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
 !$OMP MASTER
       CALL conf_cospoutputs(var%name,var%cles)
@@ -933,5 +933,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
@@ -1000,5 +1000,5 @@
 
   IF(cosp_varsdefined) THEN
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)            
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_subsample_and_optics_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_subsample_and_optics_mod.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_subsample_and_optics_mod.F90	(revision 5099)
@@ -1,7 +1,7 @@
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! Module pour remplir la variable "cospIN", calculs des proprietes optiques subcolumn
 ! pour les differents simulateurs
-!
+
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/math_lib.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/math_lib.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/math_lib.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,9 +26,9 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! July 2006: John Haynes      - Initial version
 ! May 2015:  Dustin Swales    - Modified for COSPv2.0
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 module math_lib
@@ -49,5 +49,5 @@
     !   evalues the integral (f ds) between f(index=i1) and f(index=i2)
     !   using the AVINT procedure
-    !
+
     ! Inputs:
     !   [f]    functional values
@@ -55,14 +55,14 @@
     !   [i1]   index of lower limit
     !   [i2]   index of upper limit
-    !
+
     ! Returns:
     !   result of path integral
-    !
+
     ! Notes:
     !   [s] may be in forward or reverse numerical order
-    !
+
     ! Requires:
     !   mrgrnk package
-    !
+
     ! Created:
     !   02/02/06  John Haynes (haynes@atmos.colostate.edu)
@@ -114,5 +114,5 @@
     ! Purpose:
     !   estimate the integral of unevenly spaced data
-    !
+
     ! Inputs:
     !   [ftab]     functional values
@@ -121,31 +121,31 @@
     !   [a]        lower limit of integration
     !   [b]        upper limit of integration
-    !
+
     ! Outputs:
     !   [result]   approximate value of integral
-    !
+
     ! Reference:
     !   From SLATEC libraries, in public domain
-    !
+
     !***********************************************************************
-    !
+
     !  AVINT estimates the integral of unevenly spaced data.
-    !
+
     !  Discussion:
-    !
+
     !    The method uses overlapping parabolas and smoothing.
-    !
+
     !  Modified:
-    !
+
     !    30 October 2000
     !    4 January 2008, A. Bodas-Salcedo. Error control for XTAB taken out of
     !                    loop to allow vectorization.
-    !
+
     !  Reference:
-    !
+
     !    Philip Davis and Philip Rabinowitz,
     !    Methods of Numerical Integration,
     !    Blaisdell Publishing, 1967.
-    !
+
     !    P E Hennion,
     !    Algorithm 77,
@@ -153,25 +153,25 @@
     !    Communications of the Association for Computing Machinery,
     !    Volume 5, page 96, 1962.
-    !
+
     !  Parameters:
-    !
+
     !    Input, real ( kind = 8 ) FTAB(NTAB), the function values,
     !    FTAB(I) = F(XTAB(I)).
-    !
+
     !    Input, real ( kind = 8 ) XTAB(NTAB), the abscissas at which the
     !    function values are given.  The XTAB's must be distinct
     !    and in ascending order.
-    !
+
     !    Input, integer NTAB, the number of entries in FTAB and
     !    XTAB.  NTAB must be at least 3.
-    !
+
     !    Input, real ( kind = 8 ) A, the lower limit of integration.  A should
     !    be, but need not be, near one endpoint of the interval
     !    (X(1), X(NTAB)).
-    !
+
     !    Input, real ( kind = 8 ) B, the upper limit of integration.  B should
     !    be, but need not be, near one endpoint of the interval
     !    (X(1), X(NTAB)).
-    !
+
     !    Output, real ( kind = 8 ) RESULT, the approximate value of the integral.
     ! ##########################################################################  
@@ -328,11 +328,11 @@
   ! Purpose:
   !   Returns the gamma function
-  !
+
   ! Input:
   !   [x]   value to compute gamma function of
-  !
+
   ! Returns:
   !   gamma(x)
-  !
+
   ! Coded:
   !   02/02/06  John Haynes (haynes@atmos.colostate.edu)
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mo_rng.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mo_rng.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mo_rng.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,8 +26,8 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! May 2015- D. Swales - Original version
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 MODULE mod_rng
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/modis_simulator.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/modis_simulator.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/modis_simulator.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2009:      Robert Pincus - Initial version
@@ -37,5 +37,5 @@
 ! May 2015:      Dustin Swales - Modified for COSPv2.0
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-!
+
 ! Notes on using the MODIS simulator: 
 !  *) You may provide either layer-by-layer values of optical thickness at 0.67 and 2.1
@@ -48,9 +48,9 @@
 !     the MODIS retrieval libraries (parameters re_water_min, re_ice_min, etc.) the 
 !     simulator returns missing values (re_fill)
-!
+
 ! When error conditions are encountered this code calls the function complain_and_die, 
 ! supplied at the bottom of this module. Users probably want to replace this with 
 ! something more graceful. 
-!
+
 module mod_modis_sim
   USE MOD_COSP_CONFIG, only: R_UNDEF,modis_histTau,modis_histPres,numMODISTauBins,       &
@@ -102,8 +102,8 @@
   ! ########################################################################################
   ! MODIS simulator using specified liquid and ice optical thickness in each layer 
-  !
+
   ! Note: this simulator operates on all points; to match MODIS itself night-time 
   !       points should be excluded
-  !
+
   ! Note: the simulator requires as input the optical thickness and cloud top pressure 
   !       derived from the ISCCP simulator run with parameter top_height = 1. 
@@ -443,8 +443,8 @@
         deltaX = tauLimit - totalTau
         totalTau = totalTau + deltaX
-        !
+
         ! Result for trapezoidal rule when you take less than a full step
         !   tauIncrement is a layer-integrated value
-        !
+
         totalProduct = totalProduct           &
                      + pressure(i-1) * deltaX &
@@ -534,7 +534,7 @@
     
     if(diff(lowerBound) * diff(upperBound) < 0) then     
-      !
+
       ! Interpolate the root position linearly if we bracket the root
-      !
+
       interpolate_to_min = x(upperBound) - & 
                            diff(upperBound) * (x(upperBound) - x(lowerBound)) / (diff(upperBound) - diff(lowerBound))
@@ -611,9 +611,8 @@
   
   elemental function get_g_nir (phase, re)
-    !
+
     ! Polynomial fit for asummetry parameter g in MODIS band 7 (near IR) as a function 
     !   of size for ice and water
     ! Fits from Steve Platnick
-    !
 
     integer, intent(in) :: phase
@@ -647,9 +646,9 @@
         real(wp),    intent(in) :: re
         real(wp)                :: get_ssa_nir
-        !
+
         ! Polynomial fit for single scattering albedo in MODIS band 7 (near IR) as a function 
         !   of size for ice and water
         ! Fits from Steve Platnick
-        !
+
         real(wp), dimension(4), parameter :: ice_coefficients   = (/ 0.9625, -1.8069e-2, 3.3281e-4,-2.2865e-6/)
         real(wp), dimension(3), parameter :: water_coefficients = (/ 1.0044, -1.1397e-2, 1.3300e-4 /)
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mrgrnk.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mrgrnk.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mrgrnk.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,8 +26,8 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! May 2015:  Dustin Swales    - Modified for COSPv2.0
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 Module m_mrgrnk
@@ -56,9 +56,9 @@
     ! __________________________________________________________
     Real (wp) :: XVALA, XVALB
-    !
+
     Integer, Dimension (SIZE(IRNGT)) :: JWRKT
     Integer :: LMTNA, LMTNC, IRNG1, IRNG2
     Integer :: NVAL, IIND, IWRKD, IWRK, IWRKF, JINDA, IINDA, IINDB
-    !
+
     NVAL = Min (SIZE(XDONT), SIZE(IRNGT))
     Select Case (NVAL)
@@ -71,7 +71,7 @@
        Continue
     End Select
-    !
+
     ! Fill-in the index array, creating ordered couples
-    !
+
     Do IIND = 2, NVAL, 2
        If (XDONT(IIND-1) <= XDONT(IIND)) Then
@@ -86,35 +86,35 @@
        IRNGT (NVAL) = NVAL
     End If
-    !
+
     ! We will now have ordered subsets A - B - A - B - ...
     ! and merge A and B couples into C - C - ...
-    !
+
     LMTNA = 2
     LMTNC = 4
-    !
+
     ! First iteration. The length of the ordered subsets goes from 2 to 4
-    !
+
     Do
        If (NVAL <= 2) Exit
-       !
+
        ! Loop on merges of A and B into C
-       !
+
        Do IWRKD = 0, NVAL - 1, 4
           If ((IWRKD+4) > NVAL) Then
              If ((IWRKD+2) >= NVAL) Exit
-             !
+
              ! 1 2 3
-             !
+
              If (XDONT(IRNGT(IWRKD+2)) <= XDONT(IRNGT(IWRKD+3))) Exit
-             !
+
              ! 1 3 2
-             !
+
              If (XDONT(IRNGT(IWRKD+1)) <= XDONT(IRNGT(IWRKD+3))) Then
                 IRNG2 = IRNGT (IWRKD+2)
                 IRNGT (IWRKD+2) = IRNGT (IWRKD+3)
                 IRNGT (IWRKD+3) = IRNG2
-                !
+
                 ! 3 1 2
-                !
+
              Else
                 IRNG1 = IRNGT (IWRKD+1)
@@ -125,11 +125,11 @@
              Exit
           End If
-          !
+
           ! 1 2 3 4
-          !
+
           If (XDONT(IRNGT(IWRKD+2)) <= XDONT(IRNGT(IWRKD+3))) Cycle
-          !
+
           ! 1 3 x x
-          !
+
           If (XDONT(IRNGT(IWRKD+1)) <= XDONT(IRNGT(IWRKD+3))) Then
              IRNG2 = IRNGT (IWRKD+2)
@@ -143,7 +143,7 @@
                 IRNGT (IWRKD+4) = IRNG2
              End If
-             !
+
              ! 3 x x x
-             !
+
           Else
              IRNG1 = IRNGT (IWRKD+1)
@@ -168,21 +168,21 @@
           End If
        End Do
-       !
+
        ! The Cs become As and Bs
-       !
+
        LMTNA = 4
        Exit
     End Do
-    !
+
     ! Iteration loop. Each time, the length of the ordered subsets
     ! is doubled.
-    !
+
     Do
        If (LMTNA >= NVAL) Exit
        IWRKF = 0
        LMTNC = 2 * LMTNC
-       !
+
        ! Loop on merges of A and B into C
-       !
+
        Do
           IWRK = IWRKF
@@ -196,25 +196,25 @@
           IINDA = 1
           IINDB = JINDA + 1
-          !
+
           ! Shortcut for the case when the max of A is smaller
           ! than the min of B. This line may be activated when the
           ! initial set is already close to sorted.
-          !
+
           ! IF (XDONT(IRNGT(JINDA)) <= XDONT(IRNGT(IINDB))) CYCLE
-          !
+
           ! One steps in the C subset, that we build in the final rank array
-          !
+
           ! Make a copy of the rank array for the merge iteration
-          !
+
           JWRKT (1:LMTNA) = IRNGT (IWRKD:JINDA)
-          !
+
           XVALA = XDONT (JWRKT(IINDA))
           XVALB = XDONT (IRNGT(IINDB))
-          !
+
           Do
              IWRK = IWRK + 1
-             !
+
              ! We still have unprocessed values in both A and B
-             !
+
              If (XVALA > XVALB) Then
                 IRNGT (IWRK) = IRNGT (IINDB)
@@ -232,15 +232,15 @@
                 XVALA = XDONT (JWRKT(IINDA))
              End If
-             !
+
           End Do
        End Do
-       !
+
        ! The Cs become As and Bs
-       !
+
        LMTNA = 2 * LMTNA
     End Do
-    !
+
     Return
-    !
+
   End Subroutine D_mrgrnk
   
@@ -256,9 +256,9 @@
     ! __________________________________________________________
     Real(wp) :: XVALA, XVALB
-    !
+
     Integer, Dimension (SIZE(IRNGT)) :: JWRKT
     Integer :: LMTNA, LMTNC, IRNG1, IRNG2
     Integer :: NVAL, IIND, IWRKD, IWRK, IWRKF, JINDA, IINDA, IINDB
-    !
+
     NVAL = Min (SIZE(XDONT), SIZE(IRNGT))
     Select Case (NVAL)
@@ -271,7 +271,7 @@
        Continue
     End Select
-    !
+
     ! Fill-in the index array, creating ordered couples
-    !
+
     Do IIND = 2, NVAL, 2
        If (XDONT(IIND-1) <= XDONT(IIND)) Then
@@ -286,35 +286,35 @@
        IRNGT (NVAL) = NVAL
     End If
-    !
+
     ! We will now have ordered subsets A - B - A - B - ...
     ! and merge A and B couples into C - C - ...
-    !
+
     LMTNA = 2
     LMTNC = 4
-    !
+
     ! First iteration. The length of the ordered subsets goes from 2 to 4
-    !
+
     Do
        If (NVAL <= 2) Exit
-       !
+
        ! Loop on merges of A and B into C
-       !
+
        Do IWRKD = 0, NVAL - 1, 4
           If ((IWRKD+4) > NVAL) Then
              If ((IWRKD+2) >= NVAL) Exit
-             !
+
              ! 1 2 3
-             !
+
              If (XDONT(IRNGT(IWRKD+2)) <= XDONT(IRNGT(IWRKD+3))) Exit
-             !
+
              ! 1 3 2
-             !
+
              If (XDONT(IRNGT(IWRKD+1)) <= XDONT(IRNGT(IWRKD+3))) Then
                 IRNG2 = IRNGT (IWRKD+2)
                 IRNGT (IWRKD+2) = IRNGT (IWRKD+3)
                 IRNGT (IWRKD+3) = IRNG2
-                !
+
                 ! 3 1 2
-                !
+
              Else
                 IRNG1 = IRNGT (IWRKD+1)
@@ -325,11 +325,11 @@
              Exit
           End If
-          !
+
           ! 1 2 3 4
-          !
+
           If (XDONT(IRNGT(IWRKD+2)) <= XDONT(IRNGT(IWRKD+3))) Cycle
-          !
+
           ! 1 3 x x
-          !
+
           If (XDONT(IRNGT(IWRKD+1)) <= XDONT(IRNGT(IWRKD+3))) Then
              IRNG2 = IRNGT (IWRKD+2)
@@ -343,7 +343,7 @@
                 IRNGT (IWRKD+4) = IRNG2
              End If
-             !
+
              ! 3 x x x
-             !
+
           Else
              IRNG1 = IRNGT (IWRKD+1)
@@ -368,21 +368,21 @@
           End If
        End Do
-       !
+
        ! The Cs become As and Bs
-       !
+
        LMTNA = 4
        Exit
     End Do
-    !
+
     ! Iteration loop. Each time, the length of the ordered subsets
     ! is doubled.
-    !
+
     Do
        If (LMTNA >= NVAL) Exit
        IWRKF = 0
        LMTNC = 2 * LMTNC
-       !
+
        ! Loop on merges of A and B into C
-       !
+
        Do
           IWRK = IWRKF
@@ -396,25 +396,25 @@
           IINDA = 1
           IINDB = JINDA + 1
-          !
+
           ! Shortcut for the case when the max of A is smaller
           ! than the min of B. This line may be activated when the
           ! initial set is already close to sorted.
-          !
+
           ! IF (XDONT(IRNGT(JINDA)) <= XDONT(IRNGT(IINDB))) CYCLE
-          !
+
           ! One steps in the C subset, that we build in the final rank array
-          !
+
           ! Make a copy of the rank array for the merge iteration
-          !
+
           JWRKT (1:LMTNA) = IRNGT (IWRKD:JINDA)
-          !
+
           XVALA = XDONT (JWRKT(IINDA))
           XVALB = XDONT (IRNGT(IINDB))
-          !
+
           Do
              IWRK = IWRK + 1
-             !
+
              ! We still have unprocessed values in both A and B
-             !
+
              If (XVALA > XVALB) Then
                 IRNGT (IWRK) = IRNGT (IINDB)
@@ -432,15 +432,15 @@
                 XVALA = XDONT (JWRKT(IINDA))
              End If
-             !
+
           End Do
        End Do
-       !
+
        ! The Cs become As and Bs
-       !
+
        LMTNA = 2 * LMTNA
     End Do
-    !
+
     Return
-    !
+
   End Subroutine R_mrgrnk
   Subroutine I_mrgrnk (XDONT, IRNGT)
@@ -455,9 +455,9 @@
     ! __________________________________________________________
     Integer :: XVALA, XVALB
-    !
+
     Integer, Dimension (SIZE(IRNGT)) :: JWRKT
     Integer :: LMTNA, LMTNC, IRNG1, IRNG2
     Integer :: NVAL, IIND, IWRKD, IWRK, IWRKF, JINDA, IINDA, IINDB
-    !
+
     NVAL = Min (SIZE(XDONT), SIZE(IRNGT))
     Select Case (NVAL)
@@ -470,7 +470,7 @@
        Continue
     End Select
-    !
+
     ! Fill-in the index array, creating ordered couples
-    !
+
     Do IIND = 2, NVAL, 2
        If (XDONT(IIND-1) <= XDONT(IIND)) Then
@@ -485,35 +485,35 @@
        IRNGT (NVAL) = NVAL
     End If
-    !
+
     ! We will now have ordered subsets A - B - A - B - ...
     ! and merge A and B couples into C - C - ...
-    !
+
     LMTNA = 2
     LMTNC = 4
-    !
+
     ! First iteration. The length of the ordered subsets goes from 2 to 4
-    !
+
     Do
        If (NVAL <= 2) Exit
-       !
+
        ! Loop on merges of A and B into C
-       !
+
        Do IWRKD = 0, NVAL - 1, 4
           If ((IWRKD+4) > NVAL) Then
              If ((IWRKD+2) >= NVAL) Exit
-             !
+
              ! 1 2 3
-             !
+
              If (XDONT(IRNGT(IWRKD+2)) <= XDONT(IRNGT(IWRKD+3))) Exit
-             !
+
              ! 1 3 2
-             !
+
              If (XDONT(IRNGT(IWRKD+1)) <= XDONT(IRNGT(IWRKD+3))) Then
                 IRNG2 = IRNGT (IWRKD+2)
                 IRNGT (IWRKD+2) = IRNGT (IWRKD+3)
                 IRNGT (IWRKD+3) = IRNG2
-                !
+
                 ! 3 1 2
-                !
+
              Else
                 IRNG1 = IRNGT (IWRKD+1)
@@ -524,11 +524,11 @@
              Exit
           End If
-          !
+
           ! 1 2 3 4
-          !
+
           If (XDONT(IRNGT(IWRKD+2)) <= XDONT(IRNGT(IWRKD+3))) Cycle
-          !
+
           ! 1 3 x x
-          !
+
           If (XDONT(IRNGT(IWRKD+1)) <= XDONT(IRNGT(IWRKD+3))) Then
              IRNG2 = IRNGT (IWRKD+2)
@@ -542,7 +542,7 @@
                 IRNGT (IWRKD+4) = IRNG2
              End If
-             !
+
              ! 3 x x x
-             !
+
           Else
              IRNG1 = IRNGT (IWRKD+1)
@@ -567,21 +567,21 @@
           End If
        End Do
-       !
+
        ! The Cs become As and Bs
-       !
+
        LMTNA = 4
        Exit
     End Do
-    !
+
     ! Iteration loop. Each time, the length of the ordered subsets
     ! is doubled.
-    !
+
     Do
        If (LMTNA >= NVAL) Exit
        IWRKF = 0
        LMTNC = 2 * LMTNC
-       !
+
        ! Loop on merges of A and B into C
-       !
+
        Do
           IWRK = IWRKF
@@ -595,25 +595,25 @@
           IINDA = 1
           IINDB = JINDA + 1
-          !
+
           ! Shortcut for the case when the max of A is smaller
           ! than the min of B. This line may be activated when the
           ! initial set is already close to sorted.
-          !
+
           ! IF (XDONT(IRNGT(JINDA)) <= XDONT(IRNGT(IINDB))) CYCLE
-          !
+
           ! One steps in the C subset, that we build in the final rank array
-          !
+
           ! Make a copy of the rank array for the merge iteration
-          !
+
           JWRKT (1:LMTNA) = IRNGT (IWRKD:JINDA)
-          !
+
           XVALA = XDONT (JWRKT(IINDA))
           XVALB = XDONT (IRNGT(IINDB))
-          !
+
           Do
              IWRK = IWRK + 1
-             !
+
              ! We still have unprocessed values in both A and B
-             !
+
              If (XVALA > XVALB) Then
                 IRNGT (IWRK) = IRNGT (IINDB)
@@ -631,15 +631,15 @@
                 XVALA = XDONT (JWRKT(IINDA))
              End If
-             !
+
           End Do
        End Do
-       !
+
        ! The Cs become As and Bs
-       !
+
        LMTNA = 2 * LMTNA
     End Do
-    !
+
     Return
-    !
+
   End Subroutine I_mrgrnk
 end module m_mrgrnk
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/optics_lib.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/optics_lib.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/optics_lib.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,9 +26,9 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! July 2006: John Haynes      - Initial version
 ! May 2015:  Dustin Swales    - Modified for COSPv2.0
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 module optics_lib
@@ -44,19 +44,19 @@
   subroutine m_wat(freq, tk, n_r, n_i)
     ! ############################################################################
-    !  
+
     ! Purpose:
     !   compute complex index of refraction of liquid water
-    !
+
     ! Inputs:
     !   [freq]    frequency (GHz)
     !   [tk]       temperature (K)
-    !
+
     ! Outputs:
     !   [n_r]     real part index of refraction
     !   [n_i]     imaginary part index of refraction
-    !
+
     ! Reference:
     !   Based on the work of Ray (1972)
-    !
+
     ! Coded:
     !   03/22/05  John Haynes (haynes@atmos.colostate.edu)
@@ -111,19 +111,19 @@
   subroutine m_ice(freq,t,n_r,n_i)
     ! ##########################################################################
-    !
+
     ! Purpose:
     !   compute complex index of refraction of ice
-    !
+
     ! Inputs:
     !   [freq]    frequency (GHz)
     !   [t]       temperature (K)
-    !
+
     ! Outputs:
     !   [n_r]     real part index of refraction
     !   [n_i]     imaginary part index of refraction
-    !
+
     ! Reference:
     !    Fortran 90 port from IDL of REFICE by Stephen G. Warren
-    !
+
     ! Modified:
     !   05/31/05  John Haynes (haynes@atmos.colostate.edu)
@@ -505,21 +505,21 @@
     ! Allowable wavelength range extends from 0.045 microns to 8.6 meter
     ! temperature dependence only considered beyond 167 microns.
-    ! 
+
     ! interpolation is done     n_r  vs. log(xlam)
     !                           n_r  vs.        t
     !                       log(n_i) vs. log(xlam)
     !                       log(n_i) vs.        t
-    !
+
     ! Stephen G. Warren - 1983
     ! Dept. of Atmospheric Sciences
     ! University of Washington
     ! Seattle, Wa  98195
-    !
+
     ! Based on
-    !
+
     !    Warren,S.G.,1984.
     !    Optical constants of ice from the ultraviolet to the microwave.
     !    Applied Optics,23,1206-1225
-    !
+
     ! Reference temperatures are -1.0,-5.0,-20.0, and -60.0 deg C
     ! #####################################################################
@@ -594,5 +594,5 @@
   Subroutine MieInt(Dx, SCm, Inp, Dqv, Dqxt, Dqsc, Dbsc, Dg, Xs1, Xs2, DPh, Error)
     ! ##########################################################################
-    !
+
     !     General purpose Mie scattering routine for single particles
     !     Author: R Grainger 1990
@@ -601,5 +601,5 @@
     !     code to ensure correct calculation of backscatter coeficient
     !     Options/Extend_Source
-    !
+
     ! ##########################################################################
     ! INPUTS
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/parasol.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/parasol.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/parasol.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2009, Centre National de la Recherche Scientifique
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! December 2008, S. Bony,  H. Chepfer and J-L. Dufresne : 
@@ -46,9 +46,9 @@
     !          of cloud water and cloud fraction in each sub-column of each model 
     !          gridbox.
-    !
-    !
+
+
     ! December 2008, S. Bony,  H. Chepfer and J-L. Dufresne : 
     ! - optimization for vectorization
-    !
+
     ! Version 2.0 (October 2008)
     ! Version 2.1 (December 2008)
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/prec_scops.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/prec_scops.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/prec_scops.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2008, Lawrence Livermore National Security Limited Liability Corporation
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,8 +26,8 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! May 2015- D. Swales - Modified for COSPv2.0
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 module mod_prec_scops
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/quickbeam.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/quickbeam.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/quickbeam.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! 11/2005: John Haynes - Created
@@ -33,5 +33,5 @@
 ! 01/2008  'Do while' to determine if hydrometeor(s) present in volume
 !           changed for vectorization purposes (A. Bodas-Salcedo)
-!
+
 ! 07/2010  V3.0 ... Modified to load or save scale factors to disk as a Look-Up Table (LUT)
 !  ... All hydrometeor and radar simulator properties now included in hp structure
@@ -40,8 +40,8 @@
 !     Also ... Support of Morrison 2-moment style microphyscis (Np_matrix) added 
 !  ... Changes implement by Roj Marchand following work by Laura Fowler
-!
+
 !   10/2011  Modified ngate loop to go in either direction depending on flag 
 !     hp%radar_at_layer_one.  This affects the direction in which attenuation is summed.
-!
+
 !     Also removed called to AVINT for gas and hydrometeor attenuation and replaced with simple
 !     summation. (Roger Marchand)
@@ -315,5 +315,5 @@
   ! ######################################################################################
   ! SUBROUTINE cloudsat_precipOccurence
-  !
+
   ! Notes from July 2016: Add precip flag also looped over subcolumns
   ! Modified by Tristan L'Ecuyer (TSL) to add precipitation flagging
@@ -321,7 +321,7 @@
   ! To mimic the satellite algorithm, this code applies thresholds to non-attenuated
   ! reflectivities, Ze_non, consistent with those outlined in Haynes et al, JGR (2009).
-  !
+
   ! Procedures/Notes:
-  !
+
   ! (1) If the 2-way attenuation exceeds 40 dB, the pixel will be flagged as 'heavy rain'
   ! consistent with the multiple-scattering analysis of Battaglia et al, JGR (2008).
@@ -334,5 +334,5 @@
   ! due to differening attenuation corrections from hydrometeors aloft, the non-attenuated
   ! reflectivities used in the computation of this flag cannot vary across sub-columns.
-  !
+
   ! radar_prec_flag = 1-Rain possible 2-Rain probable 3-Rain certain 
   !                   4-Snow possible 5-Snow certain 
@@ -340,5 +340,5 @@
   !                   8-Heavy Rain
   !                   9- default value
-  !
+
   ! Modified by Dustin Swales (University of Colorado) for use with COSP2.
   ! *NOTE* All inputs (Ze_out, Ze_non_out, fracPrecipIce) are at a single level from the
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/quickbeam_optics.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/quickbeam_optics.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/quickbeam_optics.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2015, Regents of the University of Colorado
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,8 +26,8 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History:
 ! May 2015:  Dustin Swales - Initial version
-! 
+
 ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 module mod_quickbeam_optics
@@ -251,5 +251,5 @@
                          ! alternative is to comment out above two lines and use the following block
                          ! MG Mie approach - adjust density of sphere with D = D_characteristic to match particle density
-                         !
+
                          ! rcfg%rho_eff(tp,1:ns,iRe_type) = (6/pi)*sd%apm(tp)*(Di*1E-6)**(sd%bpm(tp)-3)   !MG Mie approach
                          
@@ -354,16 +354,16 @@
     ! Purpose:
     !   Calculates Effective Radius (1/2 distribution 3rd moment / 2nd moment). 
-    !
+
     !   For some distribution types, the total number concentration (per kg), Np
     !   may be optionally specified.   Should be set to zero, otherwise.
-    !
+
     !   Roj Marchand July 2010
-    !
+
     ! Inputs:
-    !
+
     !   [Q]        hydrometeor mixing ratio (g/kg)  ! not needed for some distribution types
     !   [Np]       Optional Total number concentration (per kg).  0 = use defaults (p1, p2, p3)
     !   [rho_a]    ambient air density (kg m^-3)   
-    !
+
     !   Distribution parameters as per quickbeam documentation.
     !   [dtype]    distribution type
@@ -371,13 +371,13 @@
     !   [bmp]      b params for mass 
     !   [p1],[p2],[p3]  distribution parameters
-    !
+
     ! Outputs:
     !   [Re]       Effective radius, 1/2 the 3rd moment/2nd moment (um)
-    !
+
     ! Created:
     !   July 2010  Roj Marchand
     ! Modified:
     !   12/18/14  Dustin Swales: Define type REALs as double precision (dustin.swales@noaa.gov)
-    !
+
     ! ##############################################################################################
     ! ##############################################################################################
@@ -549,23 +549,23 @@
     ! Purpose:
     !   Create a discrete drop size distribution
-    !
+
     !   Starting with Quickbeam V3, this routine now allows input of 
     !   both effective radius (Re) and total number concentration (Nt)
     !   Roj Marchand July 2010
-    !
+
     !   The version in Quickbeam v.104 was modified to allow Re but not Nt 
     !   This is a significantly modified form for the version      
-    !
+
     !   Originally Part of QuickBeam v1.03 by John Haynes
     !   http://reef.atmos.colostate.edu/haynes/radarsim
-    !
+
     ! Inputs:
-    !
+
     !   [Q]        hydrometeor mixing ratio (g/kg)
     !   [Re]       Optional Effective Radius (microns).  0 = use defaults (p1, p2, p3)
-    !
+
     !   [D]        array of discrete drop sizes (um) where we desire to know the number concentraiton n(D).
     !   [nsizes]   number of elements of [D]
-    !
+
     !   [dtype]    distribution type
     !   [rho_a]    ambient air density (kg m^-3)
@@ -575,16 +575,16 @@
     !   [rho_c]    alternate constant density (kg m^-3)
     !   [p1],[p2],[p3]  distribution parameters
-    !
+
     ! Input/Output:
     !   [apm]      a parameter for mass (kg m^[-bpm])
     !   [bmp]      b params for mass
-    !
+
     ! Outputs:
     !   [N]        discrete concentrations (cm^-3 um^-1)
     !              or, for monodisperse, a constant (1/cm^3)
-    !
+
     ! Requires:
     !   function infind
-    !
+
     ! Created:
     !   11/28/05  John Haynes (haynes@atmos.colostate.edu)
@@ -868,5 +868,5 @@
     !   Part of QuickBeam v1.03 by John Haynes
     !   http://reef.atmos.colostate.edu/haynes/radarsim
-    !
+
     ! Inputs:
     !   [freq]      radar frequency (GHz)
@@ -881,10 +881,10 @@
     !   [qs]        ... efficiencies; otherwise set to -1
     !   [rho_e]     medium effective density (kg m^-3) (-1 = pure)
-    !
+
     ! Outputs:
     !   [z_eff]     unattenuated effective reflectivity factor (mm^6/m^3)
     !   [z_ray]     reflectivity factor, Rayleigh only (mm^6/m^3)
     !   [kr]        attenuation coefficient (db km^-1)
-    !
+
     ! Created:
     !   11/28/05  John Haynes (haynes@atmos.colostate.edu)
@@ -1046,5 +1046,5 @@
     ! Purpose:
     !   Compute 2-way gaseous attenuation through a volume in microwave
-    !
+
     ! Inputs:
     !   [PRES_mb]   pressure (mb) (hPa)
@@ -1052,11 +1052,11 @@
     !   [RH]        relative humidity (%)
     !   [f]         frequency (GHz), < 300 GHz
-    !
+
     ! Returns:
     !   2-way gaseous attenuation (dB/km)
-    !
+
     ! Reference:
     !   Uses method of Liebe (1985)
-    !
+
     ! Created:
     !   12/09/05  John Haynes (haynes@atmos.colostate.edu)
@@ -1234,8 +1234,8 @@
     ! ##############################################################################################
     ! Purpose:
-    !
+
     !   Initialize variables used by the radar simulator.
     !   Part of QuickBeam v3.0 by John Haynes and Roj Marchand
-    !   
+
     ! Inputs:  
     !   NAME            SIZE        DESCRIPTION
@@ -1244,5 +1244,5 @@
     ! Outputs:
     !   [sd]                        Structure that define hydrometeor types
-    !
+
     ! Local variables:
     !   [n_hydro]       (1)         Number of hydrometeor types
@@ -1265,5 +1265,5 @@
     ! ####################################################################################
     ! NOTES on HCLASS variables
-    !
+
     ! TYPE - Set to
     ! 1 for modified gamma distribution,
@@ -1272,5 +1272,5 @@
     ! 4 for monodisperse distribution,
     ! 5 for lognormal distribution.
-	!
+
     ! PHASE - Set to 0 for liquid, 1 for ice.
     ! DMIN  - The minimum drop size for this class (micron), ignored for monodisperse.
@@ -1286,8 +1286,8 @@
     ! BPM - The beta_m coefficient in equation (1), see section 4.1.
     ! RHO - Hydrometeor density (kg m-3 ).
-    ! 
+
     ! P1, P2, P3 - are default distribution parameters that depend on the type
     ! of distribution (see quickmbeam documentation for more information)
-    !
+
     ! Modified Gamma (must set P3 and one of P1 or P2)
     ! P1 - Set to the total particle number concentration Nt /rho_a (kg-1 ), where
@@ -1295,15 +1295,15 @@
     ! P2 - Set to the particle mean diameter D (micron).
     ! P3 - Set to the distribution width nu.
-    !
+
     ! Exponetial (set one of)
     ! P1 - Set to a constant intercept parameter N0 (m-4).
     ! P2 - Set to a constant lambda (micron-1).
-    !
+
     ! Power Law
     ! P1 - Set this to the value of a constant power law parameter br
-    !
+
     ! Monodisperse
     ! P1 - Set to a constant diameter D0 (micron) = Re.
-    !
+
     ! Log-normal (must set P3 and one of P1 or P2)
     ! P1 - Set to the total particle number concentration Nt /rho_a (kg-1 )
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/scops.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/scops.F90	(revision 5095)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/scops.F90	(revision 5099)
@@ -2,19 +2,19 @@
 ! Copyright (c) 2009, British Crown Copyright, the Met Office
 ! All rights reserved.
-!
+
 ! Redistribution and use in source and binary forms, with or without modification, are 
 ! permitted provided that the following conditions are met:
-!
+
 ! 1. Redistributions of source code must retain the above copyright notice, this list of 
 !    conditions and the following disclaimer.
-!
+
 ! 2. Redistributions in binary form must reproduce the above copyright notice, this list
 !    of conditions and the following disclaimer in the documentation and/or other 
 !    materials provided with the distribution.
-!
+
 ! 3. Neither the name of the copyright holder nor the names of its contributors may be 
 !    used to endorse or promote products derived from this software without specific prior
 !    written permission.
-!
+
 ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
 ! EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
@@ -26,5 +26,5 @@
 ! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
+
 ! History
 ! May 2015 - D. Swales - Modified for COSPv2.0
