Changeset 3630 for LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

Timestamp:

Feb 10, 2020, 11:04:40 AM (4 years ago)

Author:

Laurent Fairhead

Message:

Parameter new_aod is not needed anymore as it is assumed to be true
all the time. This means that we cannot replay AR4 simulations with new
LMDZ sources (we probably couldn't anyway)
LF, OB

File:

• LMDZ6/trunk/libf/phylmd/conf_phys_m.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

@@ -18 +18 @@
        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
        ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, aerosol_couple, chemistry_couple, &
-       flag_aerosol, flag_aerosol_strat, flag_aer_feedback, new_aod, &
+       flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
        flag_bc_internal_mixture, bl95_b0, bl95_b1,&
        read_climoz, &
@@ -78 +78 @@
     LOGICAL              :: flag_aer_feedback
     LOGICAL              :: flag_bc_internal_mixture
-    LOGICAL              :: new_aod
     REAL                 :: bl95_b0, bl95_b1
     REAL                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut,tau_ratqs
@@ -100 +99 @@
     LOGICAL, SAVE       :: flag_aer_feedback_omp
     LOGICAL, SAVE       :: flag_bc_internal_mixture_omp
-    LOGICAL, SAVE       :: new_aod_omp
     REAL,SAVE           :: bl95_b0_omp, bl95_b1_omp
     REAL,SAVE           :: freq_ISCCP_omp, ecrit_ISCCP_omp
@@ -453 +451 @@
     CALL getin('flag_bc_internal_mixture',flag_bc_internal_mixture_omp)
 
-    ! Temporary variable for testing purpose!
-    !Config Key  = new_aod
-    !Config Desc = which calcul of aeropt
-    !Config Def  = FALSE
-    !Config Help = Used in physiq.F
-    !
-    new_aod_omp = .TRUE.
-    CALL getin('new_aod',new_aod_omp)
-
     ! 
     !Config Key  = aer_type 
@@ -2328 +2317 @@
     flag_aer_feedback=flag_aer_feedback_omp
     flag_bc_internal_mixture=flag_bc_internal_mixture_omp
-    new_aod=new_aod_omp
     aer_type = aer_type_omp
     bl95_b0 = bl95_b0_omp
@@ -2503 +2491 @@
        IF ( flag_aerosol .EQ. 0 ) THEN
           CALL abort_physic('conf_phys','flag_aerosol=0 not compatible avec ok_ade ou ok_aie=.TRUE.',1)
-       ENDIF
-       IF ( .NOT. new_aod .AND.  flag_aerosol .NE. 1) THEN
-          CALL abort_physic('conf_phys','new_aod=.FALSE. not compatible avec flag_aerosol=1',1)
        ENDIF
     ENDIF
@@ -2676 +2661 @@
     WRITE(lunout,*) ' flag_aerosol_strat= ', flag_aerosol_strat
     WRITE(lunout,*) ' flag_aer_feedback= ', flag_aer_feedback
-    WRITE(lunout,*) ' new_aod = ', new_aod
     WRITE(lunout,*) ' aer_type = ',aer_type
     WRITE(lunout,*) ' bl95_b0 = ',bl95_b0