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

Timestamp:

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

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/create_etat0_unstruct_mod.f90 (modified) (3 diffs)

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

@@ -32 +32 @@
 
       IF (NF90_OPEN("ocean_fraction.nc", NF90_NOWRITE, file_id)==NF90_NOERR) THEN
+        CALL xios_set_file_attr("relief",enabled=.FALSE.)
         CALL xios_set_file_attr("frac_ocean",enabled=.TRUE.)
         CALL xios_set_field_attr("mask",field_ref="frac_ocean_read")
         iret=NF90_CLOSE(file_id)
       ELSE IF (NF90_OPEN("land_water_0.05.nc", NF90_NOWRITE, file_id)==NF90_NOERR) THEN
+        CALL xios_set_file_attr("relief",enabled=.FALSE.)
         CALL xios_set_file_attr("land_water",name="land_water_0.05",enabled=.TRUE.)
         CALL xios_set_field_attr("mask",field_ref="land_water")
         iret=NF90_CLOSE(file_id)
       ELSE IF (NF90_OPEN("land_water_0.25.nc", NF90_NOWRITE, file_id)==NF90_NOERR) THEN
+        CALL xios_set_file_attr("relief",enabled=.FALSE.)
         CALL xios_set_file_attr("land_water",name="land_water_0.25",enabled=.TRUE.)
         CALL xios_set_field_attr("mask",field_ref="land_water")
         iret=NF90_CLOSE(file_id)
       ELSE IF (NF90_OPEN("land_water_0.50.nc", NF90_NOWRITE, file_id)==NF90_NOERR) THEN
+        CALL xios_set_file_attr("relief",enabled=.FALSE.)
         CALL xios_set_file_attr("land_water",name="land_water_0.50",enabled=.TRUE.)
         CALL xios_set_field_attr("mask",field_ref="land_water")
@@ -262 +266 @@
     qvcon = 0.
     qccon = 0.
+    ! TKE when advected
+    tke_ancien = 0.
 
     wake_delta_pbl_TKE(:,:,:)=0
@@ -307 +313 @@
 
     CALL fonte_neige_init(run_off_lic_0)
-    CALL pbl_surface_init( fder, snsrf, qsurf, tsoil )
+    !GG
+    ! CALL pbl_surface_init( fder, snsrf, qsolsrf, tsoil )
+    CALL pbl_surface_init( fder, snsrf, qsurf, tsoil, hice, tice, bilg_cumul )
+    !GG
+
 
     IF (iflag_pbl>1 .AND. iflag_wake>=1  .AND. iflag_pbl_split >=1) then