Changeset 6161 for LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

Timestamp:

Apr 7, 2026, 10:45:03 AM (10 days ago)

Author:

idelkadi

Message:

Rewriting and simplifying the interface between the LMDZ code and the radiative transfer codes (continued)

File:

• LMDZ6/trunk/libf/phylmd/radlwsw_m.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

@@ -52 +52 @@
     ! Structure de chaque interface (rad=oldrad/rrtm/ecrad) => lmdz_call_$rad_m.F90
     !                   -> - Declarations 
-    !                      - CALL lmdz_call_radinit
+    !                      - CALL lmdz_call_rad_ini
     !                      - CALL $rad
-    !                      - CALL lmdz_call_radoutput
+    !                      - CALL lmdz_call_rad_out
     !                   -> A FAIRE
     !                           * Nettoyer les déclarations, warnings, ...
@@ -254 +254 @@
                                  ZFLUX_DIR_INTO_SUN(klon)
 
-   ! Local var
+! -------- Local var ------------------------------------------------------
    REAL(KIND=8) ZFSUP0(KDLON,KFLEV+1)
    REAL(KIND=8) ZFSDN0(KDLON,KFLEV+1)
@@ -329 +329 @@
         PRINT*,'Traitement cas iflag_rrtm = ',iflag_rrtm
 #ifdef CPP_ECRAD
-        IF (namelist_ecrad_file.EQ.'namelist_ecrad') THEN
-             PRINT*,' 1er apell Ecrad : ok_2xcall_ecrad, namelist_ecrad_file = ', &
-                  ok_2xcall_ecrad, namelist_ecrad_file    
-
           CALL lmdz_call_ecrad( &
                                 debut, dist, rmu0, fract, &
@@ -355 +351 @@
                                 ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_INTO_SUN, &
                                 cloud_cover_sw)
-        ELSE
-             PRINT*,' 2e apell Ecrad : ok_2xcall_ecrad, namelist_ecrad_file = ', &
-                     ok_2xcall_ecrad, namelist_ecrad_file
-          CALL lmdz_call_ecrad( &
-                                debut, dist, rmu0, fract, &
-                                paprs, pplay,tsol,SFRWL,alb_dir, alb_dif, &
-                                t,q,wo,cldfra, cldemi, cldtaupd,&
-                                tau_aero, piz_aero, cg_aero,&
-                                tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm,& ! rajoute par OB RRTM
-                                cldtaupi, m_allaer, qsat, flwc, fiwc, &
-                                ref_liq, ref_ice, &
-                                namelist_ecrad_file, &
-                                heat,heat0,cool,cool0,albpla,heat_volc, cool_volc,&
-                                topsw,toplw,solsw,solswfdiff,sollw,sollwdown,&
-                                topsw0,toplw0,solsw0,sollw0,&
-                                lwdnc0, lwdn0, lwdn, lwupc0, lwup0, lwup,&
-                                swdnc0, swdn0, swdn, swupc0, swup0, swup,&
-                                topswad_aero, solswad_aero,topswai_aero, solswai_aero, &
-                                topswad0_aero, solswad0_aero, topsw_aero, topsw0_aero,&
-                                solsw_aero, solsw0_aero, topswcf_aero, solswcf_aero,&
-                                toplwad_aero, sollwad_aero, toplwai_aero, sollwai_aero, &
-                                toplwad0_aero, sollwad0_aero, &
-                                ZLWFT0_i, ZFLDN0, ZFLUP0, ZSWFT0_i, ZFSDN0, ZFSUP0, &
-                                ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_INTO_SUN, &
-                                cloud_cover_sw)
-     
-        ENDIF
 #else
           abort_message="You should compile with -rrtm if running with iflag_rrtm=2"