Changeset 5791 for LMDZ6/branches/contrails/libf/phylmd/phyetat0_mod.f90

Timestamp:

Jul 28, 2025, 7:23:15 PM (6 days ago)

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/phyetat0_mod.f90 (modified) (9 diffs)

LMDZ6/branches/contrails/libf/phylmd/phyetat0_mod.f90

@@ -16 +16 @@
   USE fonte_neige_mod,  ONLY : fonte_neige_init
   USE pbl_surface_mod,  ONLY : pbl_surface_init
-  USE surface_data,     ONLY : type_ocean, version_ocean
+!GG  USE surface_data,     ONLY : type_ocean, version_ocean
+  USE surface_data,     ONLY : type_ocean, version_ocean, iflag_seaice, &
+                                   iflag_seaice_alb, iflag_leads
+!GG
   USE phyetat0_get_mod, ONLY : phyetat0_get, phyetat0_srf
   USE phys_state_var_mod, ONLY : ancien_ok, clwcon, detr_therm, phys_tstep, &
@@ -24 +27 @@
        ftsol, pbl_tke, pctsrf, q_ancien, ql_ancien, qs_ancien, qbs_ancien, &
        cf_ancien, qvc_ancien, qvcon, qccon, cfc_ancien, qtc_ancien, nic_ancien, &
-       radpas, radsol, rain_fall, &
-       ratqs, rnebcon, rugoro, sig1, snow_fall, bs_fall, solaire_etat0, sollw, sollwdown, &
+       tke_ancien, radpas, radsol, rain_fall, ratqs, &
+       rnebcon, rugoro, sig1, snow_fall, bs_fall, solaire_etat0, sollw, sollwdown, &
        solsw, solswfdiff, t_ancien, u_ancien, v_ancien, w01, wake_cstar, wake_deltaq, &
        wake_deltat, wake_delta_pbl_TKE, delta_tsurf, beta_aridity, wake_fip, wake_pe, &
@@ -31 +34 @@
        zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl, u10m, v10m, treedrg, &
        ale_wake, ale_bl_stat, ds_ns, dt_ns, delta_sst, delta_sal, dter, dser, &
-       dt_ds, ratqs_inter_, frac_tersrf, z0m_tersrf, ratio_z0m_z0h_tersrf, &
+!GG       dt_ds, ratqs_inter_
+       dt_ds, ratqs_inter_, &
+       hice, tice, bilg_cumul, &
+!GG
+       frac_tersrf, z0m_tersrf, ratio_z0m_z0h_tersrf, &
        albedo_tersrf, beta_tersrf, inertie_tersrf, alpha_soil_tersrf, &
        period_tersrf, hcond_tersrf, tsurfi_tersrf, tsoili_tersrf, tsoil_depth, &
@@ -44 +51 @@
   USE carbon_cycle_mod, ONLY: carbon_cycle_init, carbon_cycle_cpl, carbon_cycle_tr, carbon_cycle_rad, co2_send, RCO2_glo
   USE indice_sol_mod,   ONLY: nbsrf, is_ter, epsfra, is_lic, is_oce, is_sic
-  USE ocean_slab_mod,   ONLY: nslay, tslab, seaice, tice, ocean_slab_init
+  !GG USE ocean_slab_mod,   ONLY: nslay, tslab, seaice, tice, ocean_slab_init
+  USE ocean_slab_mod,   ONLY: nslay, tslab, seaice, tice_slab, ocean_slab_init
+  !GG
   USE time_phylmdz_mod, ONLY: init_iteration, pdtphys, itau_phy
   use wxios_mod, ONLY: missing_val_xios => missing_val, using_xios
@@ -163 +172 @@
   IF (ok_orolf) tab_cntrl(11) =1.
   IF (ok_limitvrai) tab_cntrl(12) =1.
+  !GG
+  tab_cntrl(18) =iflag_seaice
+  tab_cntrl(19) =iflag_seaice_alb
+  tab_cntrl(20) =iflag_leads
+  !GG
 
   itau_phy = tab_cntrl(15)
@@ -536 +550 @@
 !==================================
 !
-  IF (iflag_pbl>1) then
+  ! cas specifique de l'advection de TKE
+  IF (ok_advtke) THEN
+       ancien_ok=ancien_ok.AND.phyetat0_get(tke_ancien,"TKEANCIEN","TKEANCIEN",0.)
+  ELSE
+    tke_ancien(:,:)=0.
+  ENDIF
+
+  IF (ok_advtke) THEN
+    IF ( (maxval(tke_ancien).EQ.minval(tke_ancien))) THEN
+       ancien_ok=.false.
+    ENDIF
+  ENDIF
+
+  IF ((iflag_pbl>1)) then
      found=phyetat0_srf(pbl_tke,"TKE","Turb. Kinetic. Energ. ",1.e-8)
   ENDIF
@@ -659 +686 @@
       ! Sea ice variables
       IF (version_ocean == 'sicINT') THEN
-          found=phyetat0_get(tice,"slab_tice","slab_tice",0.)
+          found=phyetat0_get(tice_slab,"slab_tice","slab_tice",0.)
+  !GG        found=phyetat0_get(tice,"slab_tice","slab_tice",0.)
           IF (.NOT. found) THEN 
-              PRINT*, "phyetat0: Le champ <tice> est absent"
+  !GG            PRINT*, "phyetat0: Le champ <tice> est absent"
+              PRINT*, "phyetat0: Le champ <tice_slab> est absent"
               PRINT*, "Initialisation a tsol_sic"
-                  tice(:)=ftsol(:,is_sic)
+  !GG                tice(:)=ftsol(:,is_sic)
+                  tice_slab(:)=ftsol(:,is_sic)
           ENDIF 
           found=phyetat0_get(seaice,"seaice","seaice",0.)
@@ -710 +740 @@
   end if
 
+  !GG
+  ! Sea ice
+  !IF (iflag_seaice == 2) THEN
+
+  found=phyetat0_get(hice,"hice","Ice thickness",0.)
+  IF (.NOT. found) THEN
+       PRINT*, "phyetat0: Le champ <hice> est absent"
+       PRINT*, "Initialisation a hice=1m "
+       hice(:)=1.0
+  END IF
+  found=phyetat0_get(tice,"tice","Sea Ice temperature",0.)
+  IF (.NOT. found) THEN
+       PRINT*, "phyetat0: Le champ <tice> est absent"
+       PRINT*, "Initialisation a tsol_sic"
+       tice(:)=ftsol(:,is_sic)
+  END IF
+  found=phyetat0_get(bilg_cumul,"bilg_cumul","Flux conductivite + transmit sea-ice",0.)
+  IF (.NOT. found) THEN
+       PRINT*, "phyetat0: Le champ <bilg_cumul> est absent"
+       PRINT*, "Initialisation a zero"
+       bilg_cumul(:)=0.0
+  END IF
+
+  !END IF
+  !GG
   ! on ferme le fichier
   CALL close_startphy
@@ -716 +771 @@
 
   if ( iflag_physiq <= 1 ) then
-  CALL pbl_surface_init(fder, snow, qsurf, tsoil)
+  !GG CALL pbl_surface_init(fder, snow, qsurf, tsoil)
+  CALL pbl_surface_init(fder, snow, qsurf, tsoil, hice, tice, bilg_cumul)
+  !GG
   endif