Changeset 157 for trunk/SOURCES/steps_time_loop_avec_iterbeta.f90

Timestamp:

11/10/17 17:04:49 (7 years ago)

Author:

dumas

Message:

determin_marais is now called only when isynchro=1 | sortie_hz_multi and hz_output are suppressed | step_time_loop_avec_iterbeta updated as step_time_loop

File:

• trunk/SOURCES/steps_time_loop_avec_iterbeta.f90 (modified) (7 diffs)

trunk/SOURCES/steps_time_loop_avec_iterbeta.f90

@@ -23 +23 @@
   use diagno_mod
   use bilan_eau_mod
-
-
 !  use track_debug 
+
 
   implicit none
@@ -58 +57 @@
 
      call icethick3
-
      call flottab
-
      call calving
-     
      call ablation_bord
-     
      call bilan_eau
-     if (isynchro.eq.1) then
-         call shortoutput
-         diff_H = 0.
-         Bm_dtt(:,:) = 0.
-         bmelt_dtt(:,:) = 0.
-         calv_dtt(:,:)=0.
-         ablbord_dtt(:,:)=0.
-         diff_H_2D(:,:)=0.
-     endif
-        
+     call bilan_flux_output
      call flottab
-     
-     if (itracebug.eq.1)  call tracebug('apres calving')
+     if (isynchro.eq.1.or.nt.eq.1) call determin_marais
+     if (itracebug.eq.1)  call tracebug('apres marais')
 
      ! new calculation of ice surface elevation
@@ -120 +106 @@
   !====================================================================
 
-  ! horizontal plan snapshots
-  !------------------------------------------------------------------
-  !  Premiere partie des sorties horizontales
-
-  !     if (mod(abs(dble(TIME)),dble(DTSORTIE)).lt.dble(dtmin)) then
-  !
-
-
-  if ((mod(abs(TIME),dtt).lt.dtmin).or.(isynchro.eq.1)) then
-     isynchro=1
-
-     !  sorties hz 
-     call testsort_time(real(time))
-     if (iglob_hz.eq.1) then
-        call sortie_hz_multi   ! pour les variables déclarées dans 3D
-        !              call hz_output(real(time))
-     endif
-
-  else
-     iglob_hz=0
-
-  endif
-
-
   !   vertical plan snapshots (profiles)
   !------------------------------------------------------------------
@@ -150 +112 @@
   !     .or.(mod(abs(dble(TIME)),dble(DTPROFILE)).lt.dble(dtmin)) &
   !     .or.(abs(TIME-TEND).lt.dtmin)) then
-
-     !        call sortieprofile()
-
+  !  call sortieprofile()
   !endif
 
@@ -160 +120 @@
   call testsort_time_ncdf(time)
   if (iglob_ncdf .EQ. 1) call sortie_ncdf_cat
-
+  if (isynchro.eq.1) then
+    call shortoutput
+    diff_H = 0.
+    Bm_dtt(:,:) = 0.
+    bmelt_dtt(:,:) = 0.
+    calv_dtt(:,:)=0.
+    ablbord_dtt(:,:)=0.
+    diff_H_2D(:,:)=0.
+    grline_dtt(:,:)=0.
+  endif
 
   !   sortie compteur tous les dtcpt ans 
   !------------------------------------------------------------------
-     !iout == 1 sortie cptr
-     !iout == 2 sortie nc
-    if (itracebug.eq.1)  call tracebug('dans steps_time_loop avant call out_recovery ')
-
-     call out_recovery(iout)
+  !iout == 1 sortie cptr
+  !iout == 2 sortie nc
+  if (itracebug.eq.1)  call tracebug('dans steps_time_loop avant call out_recovery ')
+
+  call out_recovery(iout)
 
   ! end of outputs
@@ -295 +264 @@
      ! update values in the structures Geom_g, Temperature_g, ...
 
-     calc_temp:     if ((nt.gt.2).and.(geoplace(1:5).ne.'mism3')) then
+!afq     calc_temp:     if ((nt.gt.2).and.(geoplace(1:5).ne.'mism3')) then
+     calc_temp:     if (geoplace(1:5).ne.'mism3') then
         if (itracebug.eq.1)  call tracebug('avant appel icetemp')
         call icetemp
@@ -443 +413 @@
           iter_visco = 10
         else
-           iter_visco = 2
+          iter_visco = 2
         end if