Changeset 6161

Timestamp:

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

Author:

idelkadi

Message:

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

Location:

LMDZ6/trunk/libf/phylmd

Files:

• ecrad/lmdz/lmdz_ecrad_interface_m.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/ecrad/lmdz/radiation_scheme_mod.f90) (4 diffs)
• lmdz_call_ecrad_m.F90 (modified) (4 diffs)
• radlwsw_m.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/ecrad/lmdz/lmdz_ecrad_interface_m.F90

@@ -10 +10 @@
 !             3. Configuration a partir de namelist
 !             4. frac_std = 0.75      
-! Juillet 2023 :
+!
+! Avril 2026 : 
+! Module et routines renommees :
+! lmdz_ecrad_interface_m
+!            lmdz_ecrad_interface / lmdz_ecrad_interface_2call
 !             
 ! ============================================================================
-module interface_lmdz_ecrad
+MODULE lmdz_ecrad_interface_m
 
 IMPLICIT NONE        
@@ -19 +23 @@
 contains
 
-SUBROUTINE RADIATION_SCHEME &
+SUBROUTINE lmdz_ecrad_interface &
 ! Inputs
      & (KIDIA, KFDIA, KLON, KLEV, KAEROSOL, NSW, &
@@ -676 +680 @@
 debut_ecrad=.false.
 
-END SUBROUTINE RADIATION_SCHEME
-
-SUBROUTINE RADIATION_SCHEME_S2 &
+END SUBROUTINE lmdz_ecrad_interface
+
+SUBROUTINE lmdz_ecrad_interface_2call &
 ! Inputs
      & (KIDIA, KFDIA, KLON, KLEV, KAEROSOL, NSW, &
@@ -1382 +1386 @@
 IF (LHOOK) CALL DR_HOOK('RADIATION_SCHEME',1,ZHOOK_HANDLE)
 
-END SUBROUTINE RADIATION_SCHEME_S2
-
-end module interface_lmdz_ecrad
+END SUBROUTINE lmdz_ecrad_interface_2call
+end module lmdz_ecrad_interface_m

LMDZ6/trunk/libf/phylmd/lmdz_call_ecrad_m.F90

@@ -50 +50 @@
     USE time_phylmdz_mod, only: current_time
     USE phys_cal_mod, only: day_cur
-    USE interface_lmdz_ecrad
+    USE lmdz_ecrad_interface_m
 #endif
     USE yomcst_mod_h
@@ -540 +540 @@
              print*,' 1er apell Ecrad : ok_2xcall_ecrad, namelist_ecrad_file = ', &
                   ok_2xcall_ecrad, namelist_ecrad_file    
-             CALL RADIATION_SCHEME &
+             CALL lmdz_ecrad_interface &
                                 ! inputs
                   & (ist, iend, klon, klev, naero_spc, NSW, &
@@ -569 +569 @@
              print*,' 2e apell Ecrad : ok_2xcall_ecrad, namelist_ecrad_file = ', &
                   ok_2xcall_ecrad, namelist_ecrad_file       
-             CALL RADIATION_SCHEME_S2 &
+             CALL lmdz_ecrad_interface_2call &
                   & (ist, iend, klon, klev, naero_grp, NSW, &
                   & namelist_ecrad_file, ok_2xcall_ecrad, &
@@ -596 +596 @@
 
 
-          print *,'========= RADLWSW: apres RADIATION_SCHEME ==================== '
+          print *,'========= CALL_ECRAD apres RADIATION_SCHEME ==================== '
 
           if (lldebug_for_offline) then

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"