Changeset 6033 for LMDZ6/trunk/libf

Timestamp:

Jan 15, 2026, 5:18:06 PM (8 days ago)

Author:

evignon

Message:

fonte_neige becomes simplehydrol (follow-up on F. Cheruy presentation
in LMDZ training session) and the routines are further commented and indented

Location:

LMDZ6/trunk/libf

Files:

• phylmd/create_etat0_unstruct_mod.f90 (modified) (2 diffs)
• phylmd/fonte_neige_mod.F90 (deleted)
• phylmd/hydrol.f90 (deleted)
• phylmd/ocean_forced_mod.F90 (modified) (2 diffs)
• phylmd/phyaqua_mod.f90 (modified) (2 diffs)
• phylmd/phyetat0_mod.f90 (modified) (2 diffs)
• phylmd/phyredem.f90 (modified) (2 diffs)
• phylmd/physiq_mod.F90 (modified) (3 diffs)
• phylmd/simplehydrol_mod.F90 (added)
• phylmd/surf_land_bucket_hetero_mod.F90 (modified) (3 diffs)
• phylmd/surf_land_bucket_mod.F90 (modified) (3 diffs)
• phylmd/surf_landice_mod.F90 (modified) (4 diffs)
• phylmdiso/hydrol.f90 (deleted)
• phylmdiso/simplehydrol_mod.F90 (added)

LMDZ6/trunk/libf/phylmd/create_etat0_unstruct_mod.f90

@@ -87 +87 @@
   USE lmdz_xios
   USE infotrac_phy
-  USE fonte_neige_mod
+  USE simplehydrol_mod
   USE pbl_surface_mod
   USE phys_state_var_mod
@@ -310 +310 @@
     awake_s = 0.
 
-    CALL fonte_neige_init(run_off_lic_0)
+    CALL simplehydrol_init(run_off_lic_0)
     !GG
     ! CALL pbl_surface_init( fder, snsrf, qsolsrf, tsoil )

LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90

@@ -332 +332 @@
 !GG
     USE limit_read_mod
-    USE fonte_neige_mod,  ONLY : fonte_neige
+    USE simplehydrol_mod,  ONLY : simplehydrol
     USE indice_sol_mod
     USE albsno_mod, ONLY : albsno
@@ -676 +676 @@
 
 
-    CALL fonte_neige( knon, is_sic, knindex, dtime, &
+    CALL simplehydrol( knon, is_sic, knindex, dtime, &
          tsurf_tmp, precip_rain, precip_snow, &
          snow, qsol, tsurf_new, evap, icesub &

LMDZ6/trunk/libf/phylmd/phyaqua_mod.f90

@@ -27 +27 @@
     USE surface_data, ONLY: type_ocean, ok_veget
     USE pbl_surface_mod, ONLY: pbl_surface_init
-    USE fonte_neige_mod, ONLY: fonte_neige_init
+    USE simplehydrol_mod, ONLY: simplehydrol_init
     USE phys_state_var_mod
     USE time_phylmdz_mod, ONLY: day_ref, ndays, pdtphys, &
@@ -323 +323 @@
     ! Initialisations necessaires avant phyredem
     type_ocean = 'force'
-    CALL fonte_neige_init(run_off_lic_0)
+    CALL simplehydrol_init(run_off_lic_0)
     qsolsrf(:, :) = qsol(1) ! humidite du sol des sous surface
     snsrf(:, :) = 0. ! couverture de neige des sous surface

LMDZ6/trunk/libf/phylmd/phyetat0_mod.f90

@@ -14 +14 @@
   USE iophy, ONLY : init_iophy_new
   USE ocean_cpl_mod,    ONLY : ocean_cpl_init
-  USE fonte_neige_mod,  ONLY : fonte_neige_init
+  USE simplehydrol_mod,  ONLY : simplehydrol_init
   USE pbl_surface_mod,  ONLY : pbl_surface_init
 !GG  USE surface_data,     ONLY : type_ocean, version_ocean
@@ -763 +763 @@
 !  CALL init_iophy_new(latitude_deg, longitude_deg)
 
-  ! Initilialize module fonte_neige_mod      
-  CALL fonte_neige_init(run_off_lic_0)
+  ! Initilialize module simplehydrol_mod      
+  CALL simplehydrol_init(run_off_lic_0)
 
 END SUBROUTINE phyetat0

LMDZ6/trunk/libf/phylmd/phyredem.f90

@@ -13 +13 @@
   USE clesphys_mod_h
   USE dimphy, ONLY: klon, klev
-  USE fonte_neige_mod,  ONLY : fonte_neige_final
+  USE simplehydrol_mod,  ONLY : simplehydrol_final
   USE pbl_surface_mod,  ONLY : pbl_surface_final
   USE phys_state_var_mod, ONLY: radpas, zmasq, pctsrf,                       &
@@ -99 +99 @@
   endif
 
-  ! Get a variable calculated in module fonte_neige_mod
-  CALL fonte_neige_final(run_off_lic_0)
+  ! Get a variable calculated in module simplehydrol_mod
+  CALL simplehydrol_final(run_off_lic_0)
 
   !======================================================================

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -44 +44 @@
     USE evappot_mod, ONLY: evappot
     USE FLOTT_GWD_rando_m, only: FLOTT_GWD_rando, FLOTT_GWD_rando_first
-    USE fonte_neige_mod, ONLY  : fonte_neige_get_vars
+    USE simplehydrol_mod, ONLY  : simplehydrol_get_vars
     USE geometry_mod, ONLY: cell_area, latitude_deg, longitude_deg
     USE ioipsl, only: histbeg, histvert, histdef, histend, histsync, &
@@ -4888 +4888 @@
     ENDIF
 
-    ! Calculer l'hydrologie de la surface
-    !
-    !      CALL hydrol(dtime,pctsrf,rain_fall, snow_fall, zxevap,
-    !     .            agesno, ftsol,fqsurf,fsnow, ruis)
-    !
-
     !
     ! Calculer le bilan du sol et la derive de temperature (couplage)
@@ -5835 +5829 @@
     ! pour ecriture dans histxxx.nc
 
-    ! Get some variables from module fonte_neige_mod
-    CALL fonte_neige_get_vars(pctsrf,  &
+    ! Get some variables from module simplehydrol_mod
+    CALL simplehydrol_get_vars(pctsrf,  &
          zxfqcalving, zxfqfonte, zxffonte, zxrunofflic)
 

LMDZ6/trunk/libf/phylmd/surf_land_bucket_hetero_mod.F90

@@ -28 +28 @@
     USE limit_read_mod
     USE surface_data
-    USE fonte_neige_mod
+    USE simplehydrol_mod
     USE calcul_fluxs_mod
     USE cpl_mod
@@ -237 +237 @@
 #endif    
 
-      CALL fonte_neige( knon, is_ter, knindex, dtime, &
+      CALL simplehydrol( knon, is_ter, knindex, dtime, &
            tsurf, precip_rain, precip_snow, &
            snow, qsol, tsurf_new, evap, icesub &
@@ -361 +361 @@
         ! if snow > 0
         ! calculate snow height, run_off, age of snow
-        CALL fonte_neige( knon, is_ter, knindex, dtime, &
+        CALL simplehydrol( knon, is_ter, knindex, dtime, &
              tsurf_tersrf(:,j), precip_rain, precip_snow, &
              snow, qsol, tsurf_new_tersrf(:,j), evap_tersrf(:,j), icesub &

LMDZ6/trunk/libf/phylmd/surf_land_bucket_mod.F90

@@ -26 +26 @@
     USE limit_read_mod
     USE surface_data
-    USE fonte_neige_mod
+    USE simplehydrol_mod
     USE calcul_fluxs_mod
     USE cpl_mod
@@ -248 +248 @@
 !* Calculate snow height, run_off, age of snow
 !      
-    CALL fonte_neige( knon, is_ter, knindex, dtime, &
+    CALL simplehydrol( knon, is_ter, knindex, dtime, &
          tsurf, precip_rain, precip_snow, &
          snow, qsol, tsurf_new, evap, icesub &
@@ -275 +275 @@
      &                                   xtprecip_snow(iso_eau,i),'surf_land_bucket 227', &
      &                                   errmax,errmaxrel)
-             ! attention, dans fonte_neige, on modifie snow sans modifier
+             ! attention, dans simplehydrol, on modifie snow sans modifier
              ! xtsnow
              ! c'est fait plus tard dans gestion_neige

LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90

@@ -72 +72 @@
     USE geometry_mod,     ONLY : longitude,latitude
     USE surface_data,     ONLY : type_ocean, calice, calsno, landice_opt, iflag_albcalc
-    USE fonte_neige_mod,  ONLY : fonte_neige,run_off_lic,fqcalving_global,ffonte_global,fqfonte_global,runofflic_global
+    USE simplehydrol_mod,  ONLY : simplehydrol,run_off_lic,fqcalving_global,ffonte_global,fqfonte_global,runofflic_global
     USE cpl_mod,          ONLY : cpl_send_landice_fields
     USE calcul_fluxs_mod
@@ -642 +642 @@
     
  
-    CALL fonte_neige(knon, is_lic, knindex, dtime, &
+    CALL simplehydrol(knon, is_lic, knindex, dtime, &
          tsurf, precip_rain, precip_totsnow, &
          snow, qsol, tsurf_new, evap_totsnow, icesub_lic &
@@ -671 +671 @@
      &   ) 
 
-!        call fonte_neige_export_xtrun_off_lic_0(knon,xtrun_off_lic_0_diag)
+!        call simplehydrol_export_xtrun_off_lic_0(knon,xtrun_off_lic_0_diag)
 
 #endif
@@ -684 +684 @@
 !****************************************************************************************
 ! Send run-off on land-ice to coupler if coupled ocean.
-! run_off_lic has been calculated in fonte_neige or surf_inlandsis
+! run_off_lic has been calculated in simple_hydrol or surf_inlandsis
 ! If landice_opt>=2, corresponding call is done from surf_land_orchidee
 !****************************************************************************************