Changeset 3514

Timestamp:

May 20, 2019, 2:42:17 PM (6 years ago)

Author:

acozic

Message:

add possibility to use rrtm with inca even if we are not working with the new physics

File:

• LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/physiq_mod.F90 (modified) (6 diffs)

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/physiq_mod.F90

@@ -3359 +3359 @@
 
        call chemtime(itap+itau_phy-1, date0, dtime, itap)
-       CALL aerosol_meteo_calc( &
+       IF (config_inca == 'aero' .OR. config_inca == 'aeNP') THEN
+          CALL AEROSOL_METEO_CALC( &
                calday,pdtphys,pplay,paprs,t,pmflxr,pmflxs, &
                prfl,psfl,pctsrf,cell_area, &
                latitude_deg,longitude_deg,u10m,v10m)
+       END IF
 
        zxsnow_dummy(:) = 0.0
@@ -3428 +3430 @@
              ENDIF
           ELSE                       ! RRTM radiation
-             IF (aerosol_couple .AND. config_inca == 'aero' ) THEN
-                abort_message='config_inca=aero et rrtm=1 impossible'
-                call abort_physic(modname,abort_message,1)
-             ELSE
                 !
 #ifdef CPP_RRTM
@@ -3478 +3476 @@
 #endif
                 !
-             ENDIF
           ENDIF
        ELSE
@@ -3648 +3645 @@
              ENDIF
           ELSE                       ! RRTM radiation
-             IF (aerosol_couple .AND. config_inca == 'aero' ) THEN
-                abort_message='config_inca=aero et rrtm=1 impossible'
-                call abort_physic(modname,abort_message,1)
-             ELSE
                 !
 #ifdef CPP_RRTM
@@ -3698 +3691 @@
 #endif
                 !
-             ENDIF
           ENDIF
        ELSE
@@ -3773 +3765 @@
        ENDIF
 
-       IF (aerosol_couple.AND.config_inca=='aero') THEN 
+       IF (aerosol_couple.AND.iflag_rrtm==0) THEN 
 #ifdef INCA
           CALL radlwsw_inca  &