Changeset 112

Timestamp:

06/12/17 17:25:09 (7 years ago)

Author:

dumas

Message:

Bug fix for water cycle

Location:

trunk/SOURCES

Files:

• 3D-physique-gen_mod.f90 (modified) (4 diffs)
• Makefile.grisli.inc (modified) (2 diffs)
• Netcdf-routines/sortie_netcdf_GRISLI_mod.0.2-hassine.f90 (modified) (1 diff)
• bilan_eau.f90 (deleted)
• bilan_eau_mod.f90 (added)
• calving_frange.f90 (modified) (1 diff)
• main3D-0.4-40km.f90 (modified) (2 diffs)
• steps_time_loop.f90 (modified) (2 diffs)

trunk/SOURCES/3D-physique-gen_mod.f90

@@ -219 +219 @@
   real,dimension(2*nx*ny) :: SAV        !< 
 
-  real :: sum_H_old
-  real :: diff_H
-
-        real,dimension(nx,ny) :: H_beau_old,diff_H_2D,diff_H_water_bilan
-
   !    ************* common des tableaux a deux dimensions ******
 
@@ -263 +258 @@
   !
   real,dimension(nx,ny) :: BM           !< mass balance   'o'
-  real,dimension(nx,ny) :: Bm_dtt       !< mass balance on ice points accumulated during dtt
   real,dimension(nx,ny) :: BMELT        !< basal melting  'o'
-  real,dimension(nx,ny) :: Bmelt_dtt    !< basal melting on ice points accumulated during dtt
   real,dimension(nx,ny) :: CORRBMELT    !< correction du basal melting  'o'
   real,dimension(nx,ny) :: HWATER       !< hauteur d'eau basale dans le sediment
@@ -271 +264 @@
   real,dimension(nx,ny) :: COEFMYBMELT  !< 
   real,dimension(nx,ny) :: CALV         !< calving
-  real,dimension(nx,ny) :: calv_dtt     !< calving sur dtt (pour calcul bilan d'eau)
   
   !real,dimension(:,:,:),allocatable :: DDX  ! pour le calcul de UX 
@@ -350 +342 @@
   real,dimension(nx,ny) :: S0           !< altitude actuelle de la surface
   real,dimension(nx,ny) :: slv          !< niveau de flottaison (sealevel et lakes)
-  real,dimension(nx,ny) :: tot_water    !< bilan d'eau
   real,dimension(nx,ny) :: TJULY        !< Ground air temperature July
   real,dimension(nx,ny) :: TANN         !< Ground air temperature annual

trunk/SOURCES/Makefile.grisli.inc

@@ -73 +73 @@
         dragging_hwat-contigu_mod.o dragging_hwat_contmaj_mod.o \
         dragging_hwat_sedim_mod.o dragging_neff_slope_mod.o \
-        dragging_param_beta_mod.o \
+        dragging_param_beta_mod.o bilan_eau_mod.o \
         calving_frange.o no_calving.o no_lakes.o \
         out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \
@@ -82 +82 @@
         conserv-mass-adv-diff_sept2009_mod.o  \
         eaubasale-0.5_mod.o spinup_mod.o no_spinup_mod.o \
-        tridiag_mod-0.3.o out_horiz_mod.o bmelt-seuil-profondeur_mod.o \
-        bilan_eau.o 
+        tridiag_mod-0.3.o out_horiz_mod.o bmelt-seuil-profondeur_mod.o
+         
 
 mod_communs_RGL =   util_recovery.o \

trunk/SOURCES/Netcdf-routines/sortie_netcdf_GRISLI_mod.0.2-hassine.f90

@@ -24 +24 @@
   use module3d_phy
   use tracer_vars   ! aurel neem
-  !use icetemp_declar
+  use bilan_eau_mod
  
   implicit none

trunk/SOURCES/calving_frange.f90

@@ -17 +17 @@
 
 use module3D_phy
+use bilan_eau_mod
 implicit none
 

trunk/SOURCES/main3D-0.4-40km.f90

@@ -111 +111 @@
   use diagno_mod 
   use resolmeca_SIA_L1
+  use bilan_eau_mod
 !  use track_debug 
 
@@ -377 +378 @@
   call step_thermomeca()     ! un tour dans la boucle temporelle, partie avant icethick
   call init_sortie_ncdf
+  call init_bilan_eau
   if (itracebug.eq.1)  call tracebug(' fin routine grisli_init')
   call testsort_time_ncdf(dble(tbegin))

trunk/SOURCES/steps_time_loop.f90

@@ -21 +21 @@
   use flottab_mod
   use icetempmod
-  use diagno_mod 
+  use diagno_mod
+  use bilan_eau_mod 
   !  use track_debug 
 
@@ -110 +111 @@
   !------------------------------------------------------------------
   if ((mod(abs(TIME),NDISP*1.).lt.dtmin).or.(isynchro.eq.1).or.(nt.eq.1)) then
-     call bilan_eau
      call shortoutput
   endif