Changeset 146 for branches/iLoveclim/SOURCES/steps_time_loop.f90

Timestamp:

10/20/17 09:31:39 (7 years ago)

Author:

aquiquet

Message:

Grisli-iLoveclim branch: merged to trunk at revision 145

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/steps_time_loop.f90 (modified) (4 diffs)

branches/iLoveclim/SOURCES/steps_time_loop.f90

@@ -22 +22 @@
   use icetempmod
   use diagno_mod
-  use bilan_eau_mod 
+  use bilan_eau_mod
+  use bilan_flux_mod
   !  use track_debug 
 
@@ -56 +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
+
+!~      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
      
      call flottab
@@ -158 +158 @@
   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 
@@ -449 +458 @@
         end if
  
-        iter_visco= 10                                 ! warning, test sur l'impact iteration dragging et visco 
+!cdc        iter_visco= 10                                 ! warning, test sur l'impact iteration dragging et visco 
                                                        ! Cat 18 janv 2013