Changeset 5505 for LMDZ6/trunk/libf/phylmd

Timestamp:

Jan 23, 2025, 5:37:12 PM (8 days ago)

Author:

fhourdin

Message:

Modification SPLA pour résoudre redondance INCA

Location:

LMDZ6/trunk/libf/phylmd

Files:

• Dust/lmdz_spla_ini.f90 (added)
• Dust/lmdz_spla_nightingale.f90 (moved) (moved from LMDZ6/trunk/libf/phylmd/Dust/nightingale.f90) (2 diffs)
• Dust/precuremission.f90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/Dust/lmdz_spla_nightingale.f90

@@ -1 @@
-SUBROUTINE nightingale(u, v, u_10m, v_10m, paprs, pplay, &
+MODULE lmdz_spla_nightingale
+CONTAINS
+SUBROUTINE spla_nightingale(klon,klev,nbsrf,u, v, u_10m, v_10m, paprs, pplay, &
         cdragh, cdragm, t, q, ftsol, tsol, &
         pctsrf, lmt_dmsconc, lmt_dms)
   !
-  USE dimphy
-  USE indice_sol_mod
-USE yomcst_mod_h
+USE lmdz_spla_ini, ONLY: is_oce, RNAVO
+
 IMPLICIT NONE
   !
-
-
+INTEGER klon,klev,nbsrf
   !
-  REAL :: u(klon,klev), v(klon,klev)
-  REAL :: u_10m(klon), v_10m(klon)
-  REAL :: ftsol(klon,nbsrf)
-  REAL :: tsol(klon)
-  REAL :: paprs(klon,klev+1), pplay(klon,klev)
-  REAL :: t(klon,klev)
-  REAL :: q(klon,klev)
-  REAL :: cdragh(klon), cdragm(klon)
-  REAL :: pctsrf(klon,nbsrf)
-  REAL :: lmt_dmsconc(klon)  ! concentration oceanique DMS
-  REAL :: lmt_dms(klon)      ! flux de DMS
+  REAL, dimension(klon,klev), intent(in) :: u, v
+  REAL, dimension(klon), intent(in):: u_10m, v_10m
+  REAL, dimension(klon,nbsrf), intent(in):: ftsol
+  REAL, dimension(klon), intent(in) :: tsol
+  REAL, dimension(klon,klev+1), intent(in) :: paprs
+  REAL, dimension(klon,klev), intent(in) :: pplay
+  REAL, dimension(klon,klev), intent(in) :: t
+  REAL, dimension(klon,klev), intent(in) :: q
+  REAL, dimension(klon), intent(in) :: cdragh, cdragm
+  REAL, dimension(klon,nbsrf), intent(in) :: pctsrf
+  REAL, dimension(klon), intent(out) :: lmt_dmsconc  ! concentration oceanique DMS
+  REAL, dimension(klon), intent(out) :: lmt_dms      ! flux de DMS
   !
-  REAL :: ustar(klon), obklen(klon)
-  REAL :: u10(klon), u10n(klon)
+  REAL, dimension(klon) :: ustar, obklen
+  REAL, dimension(klon) :: u10, u10n
   REAL :: tvelocity, schmidt_corr
   REAL :: t1, t2, t3, t4, viscosity_kin, diffusivity, schmidt
@@ -82 +83 @@
   ENDDO
   !
-END SUBROUTINE nightingale
+END SUBROUTINE spla_nightingale
+END MODULE lmdz_spla_nightingale

LMDZ6/trunk/libf/phylmd/Dust/precuremission.f90

@@ -16 +16 @@
         source_tr,flux_tr,tr_seri)
 
+USE lmdz_spla_nightingale, ONLY: spla_nightingale
 USE chem_spla_mod_h
   USE chem_mod_h
@@ -84 +85 @@
   REAL :: lmt_h2sbio(klon)        ! emissions de h2s bio
 
-  EXTERNAL condsurfs, liss, nightingale
+  EXTERNAL condsurfs, liss
   !=========================================================================
   ! Modifications introduced by NHL
@@ -96 +97 @@
   !=========================================================================
 
-     CALL nightingale(u_seri, v_seri, u10m_ec, v10m_ec, paprs, &
+     CALL spla_nightingale(klon,klev,nbsrf,u_seri, v_seri, u10m_ec, v10m_ec, paprs, &
            pplay, cdragh, cdragm, t_seri, q_seri, ftsol, &
            tsol, pctsrf, lmt_dmsconc, lmt_dms)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -132 +132 @@
     USE lmdz_xios, ONLY: xios_get_field_attr, xios_field_is_active, xios_context
     USE lmdz_xios, ONLY: xios_set_current_context
-    use wxios_mod, ONLY: missing_val, using_xios
+    USE wxios_mod, ONLY: missing_val, using_xios
+    USE lmdz_spla_ini, ONLY : spla_ini
 
 #ifndef CPP_XIOS
@@ -1883 +1884 @@
 IF (CPPKEY_DUST) THEN
        ! Quand on utilise SPLA, on force iflag_phytrac=1
+       CALL spla_ini(is_oce,RNAVO)
        CALL phytracr_spl_out_init()
        CALL phys_output_write_spl(itap, pdtphys, paprs, pphis,                  &