Changeset 1647 for trunk/LMDZ.TITAN/libf/phytitan/suaer_corrk.F90

Timestamp:

Jan 11, 2017, 3:33:51 PM (8 years ago)

Author:

jvatant

Message:

+ Major clean of the new LMDZ.TITAN from too-generic options and routines (water, co2, ocean, surface type ...)
+ From this revision LMDZ.TITAN begins to be really separated from LMDZ.GENERIC
+ Partial desactivation of aerosols, only the dummy case is still enabled to keep the code running ( new aerosol routines to come in followings commits )

JVO

File:

• trunk/LMDZ.TITAN/libf/phytitan/suaer_corrk.F90 (modified) (5 diffs)

trunk/LMDZ.TITAN/libf/phytitan/suaer_corrk.F90

@@ -42 +42 @@
 !     MODIF R. Wordsworth (2009)
 !     - generalisation to arbitrary spectral bands 
-!
-!==================================================================
+!     
+!     WARNING : Titan adapt. (J. Vatant d'Ollone, 2017)
+!            - ONLY THE NO AEROSOL CASE FOR NOW SINCE WE COMPUTE THEM ANOTHER WAY !
+!            - This routine is just here to keep the code running without unplugging all (yet)                           
+!================================================================================================
 
 !     Optical properties (read in external ASCII files)
@@ -106 +109 @@
       endif
       do iaer=1,naerkind
-       if (iaer.eq.iaero_co2) then
+       if (iaer.eq.1) then ! JVO 2017 : Now iaer = 1 is always dummy co2 for noaero case, since we don't use aerosols
         forgetit=.true.
-          if (.not.noaero) then
-              print*, 'naerkind= co2', iaer
-          end if
 !     visible
         if(forgetit)then
@@ -130 +130 @@
 ! JB thinks this shouldn't matter too much, but it needs to be 
 ! fixed / decided for the final version.
-
-       if (iaer.eq.iaero_h2o) then
-        print*, 'naerkind= h2o', iaer
-
-!     visible
-         file_id(iaer,1) = 'optprop_icevis_n50.dat'
-         lamrefvis(iaer)=1.5E-6   ! 1.5um OMEGA/MEx
-!     infrared
-         file_id(iaer,2) = 'optprop_iceir_n50.dat'
-         lamrefir(iaer)=12.1E-6   ! 825cm-1 TES/MGS
-       endif
-
-       if (iaer.eq.iaero_dust) then
-        print*, 'naerkind= dust', iaer
-
-!     visible
-         file_id(iaer,1) = 'optprop_dustvis_n50.dat'
-         !lamrefvis(iaer)=1.5E-6   ! 1.5um OMEGA/MEx
-         lamrefvis(iaer)=0.67e-6
-!     infrared
-         file_id(iaer,2) = 'optprop_dustir_n50.dat'
-         !lamrefir(iaer)=12.1E-6   ! 825cm-1 TES/MGS
-         lamrefir(iaer)=9.3E-6
-       endif 
-
-       if (iaer.eq.iaero_h2so4) then
-         print*, 'naerkind= h2so4', iaer
-
-!     visible
-         file_id(iaer,1) = 'optprop_h2so4vis_n20.dat'
-         !lamrefir(iaer)=  doesn't exist?
-         lamrefvis(iaer)=1.5E-6   ! no idea, must find
-!     infrared
-         file_id(iaer,2) = 'optprop_h2so4ir_n20.dat'
-         !lamrefir(iaer)=12.1E-6   ! 825cm-1 TES/MGS
-         lamrefir(iaer)=9.3E-6 ! no idea, must find
-! added by LK
-       endif
 
        if (iaer.eq.iaero_back2lay) then
@@ -328 +290 @@
 
       jfile = jfile+1
-      IF ((idomain.NE.iaero_co2).OR.(iaer.NE.iaero_co2)) THEN
+      IF ((idomain.NE.1).OR.(iaer.NE.1)) THEN
          endwhile = .true.
       ENDIF
@@ -346 +308 @@
 
 !     1.5 If Francois' data, convert wvl to metres
-       if(iaer.eq.iaero_co2)then
+       if(iaer.eq.1)then
          if(forgetit)then
          !   print*,'please sort out forgetit for naerkind>1'