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

Timestamp:

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

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/phyredem.f90 (modified) (7 diffs)

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

@@ -25 +25 @@
                                 qvcon, qccon,                                &
                                 qvc_ancien, cfc_ancien, qtc_ancien, nic_ancien, &
-                                u_ancien, v_ancien,                          &
+                                u_ancien, v_ancien, tke_ancien,              &
                                 clwcon, rnebcon, ratqs, pbl_tke,             &
                                 wake_delta_pbl_tke, zmax0, f0, sig1, w01,    &
@@ -36 +36 @@
                                 du_gwd_rando, du_gwd_front, u10m, v10m, &
                                 treedrg, solswfdiff, delta_sal, ds_ns, dt_ns, &
-                                delta_sst, ratqs_inter_, dter, dser, dt_ds,  &
-                                frac_tersrf, z0m_tersrf, ratio_z0m_z0h_tersrf, &
-                                albedo_tersrf, beta_tersrf, inertie_tersrf,  &
-                                hcond_tersrf, tsurfi_tersrf, tsoili_tersrf, tsoil_depth, &
-                                qsurf_tersrf, tsurf_tersrf, tsoil_tersrf, tsurf_new_tersrf, &
-                                cdragm_tersrf, cdragh_tersrf, &
-                                swnet_tersrf, lwnet_tersrf, fluxsens_tersrf, fluxlat_tersrf
+!GG                                delta_sst, ratqs_inter_, dter,
+                                !dser, dt_ds
+                                delta_sst, ratqs_inter_, dter, dser,&
+                                & dt_ds, hice, tice, bilg_cumul, &
+!GG
+                                frac_tersrf, z0m_tersrf,&
+                                     & ratio_z0m_z0h_tersrf,&
+                                     & albedo_tersrf, beta_tersrf,&
+                                     & inertie_tersrf, hcond_tersrf,&
+                                     & tsurfi_tersrf, tsoili_tersrf,&
+                                     & tsoil_depth, qsurf_tersrf,&
+                                     & tsurf_tersrf, tsoil_tersrf,&
+                                     & tsurf_new_tersrf,&
+                                     & cdragm_tersrf, cdragh_tersrf,&
+                                     & swnet_tersrf, lwnet_tersrf,&
+                                     & fluxsens_tersrf, fluxlat_tersrf
 
   USE geometry_mod, ONLY : longitude_deg, latitude_deg
@@ -50 +59 @@
   USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send, carbon_cycle_rad, RCO2_glo
   USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic, epsfra
-  USE surface_data, ONLY: type_ocean, version_ocean
-  USE ocean_slab_mod, ONLY : nslay, tslab, seaice, tice, fsic
+!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 ocean_slab_mod, ONLY : nslay, tslab, seaice, tice_slab, fsic
   USE time_phylmdz_mod, ONLY: annee_ref, day_end, itau_phy, pdtphys
   use config_ocean_skin_m, only: activate_ocean_skin
@@ -123 +135 @@
   IF (carbon_cycle_rad) tab_cntrl(17) = RCO2_glo
   !PRINT*, "PC : phyredem RCO2_glo =",RCO2_glo
+  !GG
+  tab_cntrl(18 ) = iflag_seaice
+  tab_cntrl(19 ) = iflag_seaice_alb
+  tab_cntrl(20 ) = iflag_leads
+  !GG
 
   DO pass=1,2   ! pass=1 netcdf definition ; pass=2 netcdf write
@@ -227 +244 @@
     CALL put_field_srf1(pass,"SNOW", "Neige", snow(:,:))
 
+    !GG
+    CALL put_field(pass,"hice", "Ice thickness", hice)
+    CALL put_field(pass,"tice", "Sea Ice temperature", tice)
+    CALL put_field(pass,"bilg_cumul", "Flux conductivite + transmit sea-ice", bilg_cumul)
+    !GG
+
     CALL put_field(pass,"RADS", "Rayonnement net a la surface", radsol)
 
@@ -313 +336 @@
 
     ! DEB TKE PBL !
+
+    IF (ok_advtke) THEN
+      CALL put_field(pass,"TKEANCIEN", "TKEANCIEN", tke_ancien)
+    ENDIF
+
 
     IF (iflag_pbl>1) then
@@ -410 +438 @@
         IF (version_ocean == 'sicINT') THEN
             CALL put_field(pass,"seaice", "Slab seaice (kg/m2)", seaice)
-            CALL put_field(pass,"slab_tice", "Slab sea ice temperature", tice)
+            CALL put_field(pass,"slab_tice", "Slab sea ice temperature", tice_slab)
         END IF
     END IF