Changeset 5935

Timestamp:

Dec 16, 2025, 7:40:18 PM (28 hours ago)

Author:

lfalletti

Message:

Modifs pour corriger l'utilisation du wrapper clé CPP pour REPROBUS.

Location:

LMDZ6/trunk/libf

Files:

• misc/lmdz_reprobus_wrappers.F90 (modified) (2 diffs)
• phylmd/infotrac_phy.F90 (modified) (1 diff)
• phylmd/phytrac_mod.f90 (modified) (2 diffs)
• phylmd/radlwsw_m.F90 (modified) (2 diffs)
• phylmd/tracreprobus_mod.f90 (modified) (4 diffs)

LMDZ6/trunk/libf/misc/lmdz_reprobus_wrappers.F90

@@ -81 +81 @@
   END SUBROUTINE coord_hyb_rep
 
-  SUBROUTINE chemmain_rlong_1401(tr_seri, xlon, xlat, t_seri, pplay, paprs, pphi, pphis, presnivs, sh, debutphy)
-    REAL :: tr_seri(:,:,:), xlon(:), xlat(:), t_seri(:,:), pplay(:,:), paprs(:,:), pphi(:,:), pphis(:), presnivs(:), sh(:,:)
+  SUBROUTINE chemmain_rlong_1401(tr_seri, xlon, xlat, t_seri, pplay, paprs, pphi, pphis, presnivs, debutphy, ql_seri, qs_seri, q_seri,  &
+            nSpeciesErupt, flag_emit, budg_emi, nErupt, &
+            injdur, year_emit_vol, mth_emit_vol, &
+            day_emit_vol, altemiss_vol, sigma_alt_vol, &
+            ponde_lonlat_vol, xlat_min_vol, xlat_max_vol, &
+            xlon_min_vol, xlon_max_vol, id_species, &
+            m_species_emiss_vol)
+    REAL :: tr_seri(:,:,:), xlon(:), xlat(:), t_seri(:,:), pplay(:,:), paprs(:,:), pphi(:,:), pphis(:), presnivs(:), ql_seri(:,:), qs_seri(:,:), q_seri(:,:)
+    REAL :: budg_emi(:,:), injdur, altemiss_vol(:), sigma_alt_vol(:), xlat_min_vol(:), xlat_max_vol(:), xlon_min_vol(:), xlon_max_vol(:), m_species_emiss_vol(:,:)
+    INTEGER :: nSpeciesErupt, flag_emit, nErupt, year_emit_vol(:), mth_emit_vol(:), day_emit_vol(:), ponde_lonlat_vol(:), id_species(:)
     LOGICAL :: debutphy
     CALL lmdz_reprobus_wrapper_abort
@@ -92 +100 @@
   END SUBROUTINE rtime
 
-  SUBROUTINE rad_interactif(pozon, iof)
-    real :: pozon(:,:,:)
+  SUBROUTINE rad_interactif(pozon, iof,tr_seri)
+    real :: pozon(:,:,:), tr_seri(:,:,:)
     integer :: iof
     CALL lmdz_reprobus_wrapper_abort

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -135 +135 @@
    USE iniprint_mod_h
    USE ioipsl_getin_p_mod, ONLY: getin_p
-   USE lmdz_reprobus_wrappers, ONLY: Init_chem_rep_trac
+   USE CHEM_REP, ONLY: init_chem_rep_trac, init_chem_rep_phys, init_chem_rep_xjour, &
+        pdel, d_q_rep, d_ql_rep, d_qi_rep, &
+        iter, rsuntime, pdt_rep, daynum, rch42d, rn2o2d, rcfc112d, rcfc122d, &
+        ptrop, ttrop, ztrop, gravit, itroprep, Z1, Z2, fac, B, &
+        solaireTIME, ok_SUNTIME, ok_rtime2d, ndimozon
+   USE CHEMINI_REPR, ONLY: CHEMINI_REP
+   USE chemmain_rlong, ONLY: chemmain_rlong_1401
    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER
    USE mod_phys_lmdz_para, ONLY: is_master, is_omp_master

LMDZ6/trunk/libf/phylmd/phytrac_mod.f90

@@ -149 +149 @@
     USE phys_local_var_mod, ONLY: budg_dep_dry_h2so4, budg_dep_wet_h2so4
     USE phys_local_var_mod, ONLY: budg_dep_dry_part,  budg_dep_wet_part
+    USE phys_local_var_mod, ONLY: ql_seri, qs_seri, q_seri, t_repr=>t_seri
     USE infotrac_phy, ONLY: nbtr_sulgas, id_OCS_strat, id_SO2_strat, id_H2SO4_strat
     USE strataer_nuc_mod, ONLY : tracstrataer_init
@@ -642 +643 @@
        CALL tracreprobus(pdtphys, gmtime, debutphy, julien, &
             presnivs, xlat, xlon, pphis, pphi, &
-            t_seri, pplay, paprs, sh , &
-            tr_seri)
+            t_repr, pplay, paprs, &
+            tr_seri, ql_seri, qs_seri, q_seri)
 
     ELSE IF (type_trac == 'co2i') THEN

LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

@@ -57 +57 @@
     USE lmdz_reprobus_wrappers, ONLY : solaireTIME, ok_SUNTIME, ndimozon, rad_interactif
     USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_REPROBUS
+    USE phys_local_var_mod, ONLY : tr_seri
 
 #ifdef CPP_RRTM
@@ -660 +661 @@
           IF (CPPKEY_REPROBUS) THEN
              ndimozon = size(wo, 3)
-             CALL RAD_INTERACTIF(POZON,iof)
+             CALL RAD_INTERACTIF(POZON,iof,tr_seri)
           END IF
        ENDIF

LMDZ6/trunk/libf/phylmd/tracreprobus_mod.f90

@@ -8 +8 @@
   SUBROUTINE tracreprobus(pdtphys, gmtime, debutphy, julien, &
        presnivs, xlat, xlon, pphis, pphi, &
-       t_seri, pplay, paprs, sh , &
-       tr_seri)
+       t_seri, pplay, paprs, & !sh_in , &
+       tr_seri, ql_seri, qs_seri, q_seri)
 
     USE dimphy
@@ -18 +18 @@
          d_q_rep,d_ql_rep,d_qi_rep, chemmain_rlong_1401
     USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_REPROBUS
+    USE strataer_local_var_mod, ONLY: nSpeciesErupt, flag_emit, budg_emi, nErupt, &                       
+            injdur, year_emit_vol, mth_emit_vol, &             
+            day_emit_vol, altemiss_vol, sigma_alt_vol, &          
+            ponde_lonlat_vol, xlat_min_vol, xlat_max_vol, &
+            xlon_min_vol, xlon_max_vol, id_species, &
+            m_species_emiss_vol
     IMPLICIT NONE
 
@@ -36 +42 @@
     REAL,DIMENSION(klon,klev),INTENT(IN)   :: pplay   ! pression pour le mileu de chaque couche (en Pa)
     REAL,DIMENSION(klon,klev+1),INTENT(IN) :: paprs   ! pression pour chaque inter-couche (en Pa)
-    REAL,DIMENSION(klon,klev),INTENT(IN)   :: sh      ! humidite specifique   
+    REAL,DIMENSION(klon,klev),INTENT(IN)   :: ql_seri
+    REAL,DIMENSION(klon,klev),INTENT(IN)   :: qs_seri
+    REAL,DIMENSION(klon,klev),INTENT(IN)   :: q_seri
 
 
@@ -97 +105 @@
             pphis,   & !argument phytrac (meme nom)
             presnivs, & !argument phytrac (meme nom)
-            sh,      & !argument phytrac (meme nom)
-            debutphy) !argument phytrac (change de nom apres: debut)
+            debutphy, & !argument phytrac (change de nom apres: debut)
+            ql_seri, &
+            qs_seri, &
+            q_seri,  &
+            nSpeciesErupt, flag_emit, budg_emi, nErupt, &
+            injdur, year_emit_vol, mth_emit_vol, & 
+            day_emit_vol, altemiss_vol, sigma_alt_vol, & 
+            ponde_lonlat_vol, xlat_min_vol, xlat_max_vol, &
+            xlon_min_vol, xlon_max_vol, id_species, &
+            m_species_emiss_vol)
        ! pdel, pdt_rep, daynum : definit dans phytrac et utilise dans chemmain
        !                 et transporte par CHEM_REP