Changeset 5618 for LMDZ6/branches/contrails/libf/phylmdiso

Timestamp:

Apr 15, 2025, 11:56:45 AM (3 months ago)

Author:

aborella

Message:

Merge with trunk testing r5597. We have convergence in prod and debug in NPv7.0.1c

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmdiso/calltherm.F90 (deleted)
• libf/phylmdiso/calltherm_mod.F90 (copied) (copied from LMDZ6/trunk/libf/phylmdiso/calltherm_mod.F90)
• libf/phylmdiso/lmdz_fake_call.f90 (copied) (copied from LMDZ6/trunk/libf/phylmdiso/lmdz_fake_call.f90)
• libf/phylmdiso/phyetat0_mod.F90 (modified) (1 diff)
• libf/phylmdiso/phyredem.F90 (modified) (1 diff)
• libf/phylmdiso/physiq_mod.F90 (modified) (15 diffs)

LMDZ6/branches/contrails/libf/phylmdiso/phyetat0_mod.F90

@@ -549 +549 @@
      it = 0
      DO iq = 1, nqtot
-        IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+        IF(.NOT.tracers(iq)%isInPhysics) CYCLE
         it = it+1
         tname = tracers(iq)%name

LMDZ6/branches/contrails/libf/phylmdiso/phyredem.F90

@@ -370 +370 @@
        it = 0
        DO iq = 1, nqtot
-          IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+          IF(.NOT.tracers(iq)%isInPhysics) CYCLE
           it = it+1
           CALL put_field(pass,"trs_"//tracers(iq)%name, "", trs(:, it))

LMDZ6/branches/contrails/libf/phylmdiso/physiq_mod.F90

@@ -39 +39 @@
     USE ioipsl_getin_p_mod, ONLY : getin_p
     USE indice_sol_mod
-    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac,addPhase, ivap, iliq, isol
+    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac,addPhase, ivap, iliq, isol, ibs, icf, irvc
     USE strings_mod,  ONLY: strIdx
     USE iophy
@@ -83 +83 @@
     USE lmdz_atke_turbulence_ini, ONLY : atke_ini
     USE lmdz_thermcell_ini, ONLY : thermcell_ini, iflag_thermals_tenv
+    USE calltherm_mod, ONLY : calltherm
     USE lmdz_thermcell_dtke, ONLY : thermcell_dtke
     USE lmdz_blowing_snow_ini, ONLY : blowing_snow_ini , qbst_bs 
@@ -133 +134 @@
     USE lmdz_xios, ONLY: xios_set_current_context
     use wxios_mod, ONLY: missing_val, using_xios
+    USE lmdz_spla_ini, ONLY : spla_ini
 
 #ifndef CPP_XIOS
@@ -290 +292 @@
        cldh, cldl,cldm, cldq, cldt,      &
        JrNt,                             &
-       dthmin, evap, snowerosion,fder, plcl, plfc,   &
+       dthmin, evap, snowerosion, icesub_lic, fder, plcl, plfc,   &
        prw, prlw, prsw, prbsw, water_budget,         &
        s_lcl, s_pblh, s_pblt, s_therm,   &
@@ -579 +581 @@
     !======================================================================
     !
-    ! indices de traceurs eau vapeur, liquide, glace, fraction nuageuse LS (optional), blowing snow (optional)
-!    INTEGER,SAVE :: ivap, iliq, isol, irneb, ibs
-!!$OMP THREADPRIVATE(ivap, iliq, isol, irneb, ibs)
-! Camille Risi 25 juillet 2023: ivap,iliq,isol deja definis dans infotrac_phy. 
-! Et ils sont utiles ailleurs que dans physiq_mod (ex:
-! reevap -> je commente les 2 lignes au dessus et je laisse la definition
-! plutot dans infotrac_phy
-    INTEGER,SAVE :: irneb, ibs, icf,irvc
-!$OMP THREADPRIVATE(irneb, ibs, icf,irvc)
-!
     !
     ! Variables argument:
@@ -1121 +1113 @@
 
     REAL picefra(klon,klev)
-    REAL zrel_oro(klon)
+    REAL nm_oro(klon)
     !IM cf. AM 081204 END
     !
@@ -1459 +1451 @@
 
     IF (first) THEN 
-       ivap = strIdx(tracers(:)%name, addPhase('H2O', 'g'))
-       iliq = strIdx(tracers(:)%name, addPhase('H2O', 'l'))
-       isol = strIdx(tracers(:)%name, addPhase('H2O', 's'))
-       ibs  = strIdx(tracers(:)%name, addPhase('H2O', 'b'))
-       icf  = strIdx(tracers(:)%name, addPhase('H2O', 'f'))
-       irvc = strIdx(tracers(:)%name, addPhase('H2O', 'c'))
 !       CALL init_etat0_limit_unstruct
        IF (.NOT. create_etat0_limit) CALL init_limit_read(days_elapsed)
@@ -2031 +2017 @@
 IF (CPPKEY_DUST) THEN
        ! Quand on utilise SPLA, on force iflag_phytrac=1
+       CALL spla_ini(is_oce,RNAVO,RG,RD,RCPD,RLVTT,RLSTT,RETV,RTT,              &
+               R2ES,R3LES,R3IES,R4LES,R4IES,R5LES,R5IES,RVTMP2)
        CALL phytracr_spl_out_init()
        CALL phys_output_write_spl(itap, pdtphys, paprs, pphis,                  &
@@ -3318 +3306 @@
                                 !albedo SB >>>
                                 ! albsol1,   albsol2,   sens,    evap,      &
-            albsol_dir,   albsol_dif,   sens,    evap, snowerosion, &  
+            albsol_dir,   albsol_dif,   sens,    evap, snowerosion, icesub_lic, &  
                                 !albedo SB <<<
             albsol3_lic,runoff,   snowhgt,   qsnow, to_ice, sissnow, &
@@ -4748 +4736 @@
           endif
 
-          CALL calltherm(pdtphys &
+          CALL calltherm(itap, pdtphys &
                ,pplay,paprs,pphi,weak_inversion &
                         ! ,u_seri,v_seri,t_seri,q_seri,zqsat,debut & !jyg
@@ -6283 +6271 @@
     ! a l'echelle sous-maille:
     !
+   
+    ! calculation of nm_oro 
+    DO i=1,klon
+          ! nm_oro is a proxy for the number of subgrid scale mountains
+          ! -> condition on nm_oro can deactivate the lifting on tilted planar terrains
+          !    such as ice sheets (work by V. Wiener)
+          ! in such a case, the SSO scheme should activate only where nm_oro>0 i.e. by setting
+          ! nm_oro_t=0.
+          nm_oro(i)=zsig(i)*sqrt(cell_area(i)*(pctsrf(i,is_ter)+pctsrf(i,is_lic)))/(4.*MAX(zstd(i),1.e-8))-1.
+    END DO
+
     IF (prt_level .GE.10) THEN
        print *,' call orography ? ', ok_orodr
     ENDIF
-    !
+
     IF (ok_orodr) THEN
        !
@@ -6293 +6292 @@
        DO i=1,klon
           itest(i)=0
-          zrel_oro(i)=zstd(i)/(max(zsig(i),1.E-8)*sqrt(cell_area(i)))
-          !zrel_oro: relative mountain height wrt relief explained by mean slope
-          ! -> condition on zrel_oro can deactivate the drag on tilted planar terrains
-          !    such as ice sheets (work by V. Wiener)
           ! zpmm_orodr_t and zstd_orodr_t are activation thresholds set by F. Lott to
           ! earn computation time but they are not physical.
-          IF (((zpic(i)-zmea(i)).GT.zpmm_orodr_t).AND.(zstd(i).GT.zstd_orodr_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF (((zpic(i)-zmea(i)).GT.zpmm_orodr_t).AND.(zstd(i).GT.zstd_orodr_t).AND.(nm_oro(i).GT.nm_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -6352 +6347 @@
        DO i=1,klon
           itest(i)=0
-          !zrel_oro: relative mountain height wrt relief explained by mean slope
-          ! -> condition on zrel_oro can deactivate the lifting on tilted planar terrains
-          !    such as ice sheets (work by V. Wiener)
-          zrel_oro(i)=zstd(i)/(max(zsig(i),1.E-8)*sqrt(cell_area(i)))
-          IF (((zpic(i)-zmea(i)).GT.zpmm_orolf_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF (((zpic(i)-zmea(i)).GT.zpmm_orolf_t).AND.(nm_oro(i).GT.nm_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -6630 +6621 @@
 ! car on peut s'attendre a ce que les petites echelles produisent aussi de la TKE
 ! Mais attention, cela ne va pas dans le sens de la conservation de l'energie! 
-          IF ((zstd(i).GT.1.0) .AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF ((zstd(i).GT.1.0) .AND.(nm_oro(i).GT.nm_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -6642 +6633 @@
        DO i=1,klon
           itest(i)=0
-        IF (((zpic(i)-zmea(i)).GT.zpmm_orodr_t).AND.(zstd(i).GT.zstd_orodr_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+        IF (((zpic(i)-zmea(i)).GT.zpmm_orodr_t).AND.(zstd(i).GT.zstd_orodr_t).AND.(nm_oro(i).GT.nm_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1