From c5478789b1311e999ee751cdefb82220a83f8be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D1=8F=20=D0=A1?= =?UTF-8?q?=D1=83=D1=8F=D0=B7=D0=BE=D0=B2=D0=B0?= <viktoriasuazova@MacBook-Pro-Viktoria.local> Date: Tue, 11 Feb 2025 01:36:50 +0300 Subject: [PATCH] test sheba snow no write(*,*) --- srcF/sfx_api_inmcm.f90 | 2 +- srcF/sfx_config.f90 | 5 +++-- srcF/sfx_sheba_noniterative.f90 | 6 +++--- srcF/sfx_z0m_all_surface.f90 | 6 +++--- srcF/sfx_z0t_all_surface.f90 | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/srcF/sfx_api_inmcm.f90 b/srcF/sfx_api_inmcm.f90 index c1354a6..37f45df 100644 --- a/srcF/sfx_api_inmcm.f90 +++ b/srcF/sfx_api_inmcm.f90 @@ -42,7 +42,7 @@ contains meteo%depth = depth_inm meteo%lai = lai_inm meteo%surface_type = IVEG_sfx - write(*,*) 'surface_type, IVEG_sfx', meteo%surface_type, IVEG_sfx + !write(*,*) 'surface_type, IVEG_sfx', meteo%surface_type, IVEG_sfx end subroutine inmcm_to_sfx_in_cell ! -------------------------------------------------------------------------------- diff --git a/srcF/sfx_config.f90 b/srcF/sfx_config.f90 index 68df2c5..d90c7b2 100644 --- a/srcF/sfx_config.f90 +++ b/srcF/sfx_config.f90 @@ -167,8 +167,8 @@ contains dataset%filename = get_dataset_filename(id) dataset%nmax = 0 - dataset%surface = surface_lake - dataset%surface_type = surface_lake + dataset%surface = surface_snow + dataset%surface_type = surface_snow dataset%z0_h = -1.0 dataset%lai = 1.0 dataset%depth = 10.0 @@ -176,6 +176,7 @@ contains if (id == dataset_mosaic) then dataset%h = 6.0 dataset%z0_m = 0.0078 + dataset%surface_type = surface_snow else if (id == dataset_irgason) then dataset%h = 9.2 dataset%z0_m = 0.01 diff --git a/srcF/sfx_sheba_noniterative.f90 b/srcF/sfx_sheba_noniterative.f90 index c7912ef..9ca8766 100644 --- a/srcF/sfx_sheba_noniterative.f90 +++ b/srcF/sfx_sheba_noniterative.f90 @@ -154,7 +154,7 @@ contains h = meteo%h(i), & U = meteo%U(i), dT = meteo%dT(i), Tsemi = meteo%Tsemi(i), dQ = meteo%dQ(i), & z0_m = meteo%z0_m(i), depth=meteo%depth(i), lai=meteo%lai(i), surface_type=meteo%surface_type(i)) - write(*,*) 'get_flux', meteo%surface_type(i) + !write(*,*) 'get_flux', meteo%surface_type(i) call get_surface_fluxes(sfx_cell, meteo_cell, numerics) call push_sfx_data(sfx, sfx_cell, i) @@ -302,7 +302,7 @@ contains ! --- get the fluxes ! ---------------------------------------------------------------------------- - write(*,*) 'surface_type', surface_type + !write(*,*) 'surface_type', surface_type if (Rib > 0.0) then ! --- stable stratification block @@ -311,7 +311,7 @@ contains ! Rib = min(Rib, Rib_max) if (surface_type == surface_snow) then - write(*,*) 'snow', Ri_sn, Rib + ! write(*,*) 'snow', Ri_sn, Rib Rib=Rib+Ri_sn endif diff --git a/srcF/sfx_z0m_all_surface.f90 b/srcF/sfx_z0m_all_surface.f90 index 593f663..183403c 100644 --- a/srcF/sfx_z0m_all_surface.f90 +++ b/srcF/sfx_z0m_all_surface.f90 @@ -84,7 +84,7 @@ module sfx_z0m_all_surface ! --- define dynamic velocity in neutral conditions u_dyn0 = Uc / c - write(*,*) 'ch', z0_m, u_dyn0 + !write(*,*) 'ch', z0_m, u_dyn0 end subroutine ! -------------------------------------------------------------------------------- @@ -125,7 +125,7 @@ module sfx_z0m_all_surface u_dyn0 = Uc / c - write(*,*) 'ow', z0_m, u_dyn0 + !write(*,*) 'ow', z0_m, u_dyn0 end subroutine ! -------------------------------------------------------------------------------- @@ -204,7 +204,7 @@ subroutine get_dynamic_roughness_map(z0_m, u_dyn0, U, h, z0m_map) z0_m=z0m_map h0_m = h / z0_m u_dyn0 = U * kappa / log(h0_m) - write(*,*) 'map', z0_m, u_dyn0 + !write(*,*) 'map', z0_m, u_dyn0 end subroutine ! -------------------------------------------------------------------------------- diff --git a/srcF/sfx_z0t_all_surface.f90 b/srcF/sfx_z0t_all_surface.f90 index c6581f3..39a570e 100644 --- a/srcF/sfx_z0t_all_surface.f90 +++ b/srcF/sfx_z0t_all_surface.f90 @@ -49,7 +49,7 @@ module sfx_z0t_all_surface B = min(B, B_max_land) z0_t = z0_m / exp(B) - write(*,*) 'kl_land', z0_t, B + !write(*,*) 'kl_land', z0_t, B end subroutine ! -------------------------------------------------------------------------------- @@ -75,7 +75,7 @@ module sfx_z0t_all_surface B = min(B, B_max_ocean) z0_t = z0_m / exp(B) - write(*,*) 'kl_water', z0_t, B + !write(*,*) 'kl_water', z0_t, B end subroutine -- GitLab