Changeset 142 for trunk/SOURCES

Timestamp:

10/17/17 17:03:23 (7 years ago)

Author:

dumas

Message:

Debug output suppressed and bug correction in calving

Location:

trunk/SOURCES

Files:

• Ant40_files/output_anta40_mod-0.4.f90 (modified) (4 diffs)
• bilan_flux_output_mod.f90 (modified) (4 diffs)
• calving_frange.f90 (modified) (2 diffs)
• flottab2-0.7.f90 (modified) (2 diffs)
• main3D-0.4-40km.f90 (modified) (1 diff)
• steps_time_loop.f90 (modified) (2 diffs)
• util_recovery.f90 (modified) (3 diffs)

trunk/SOURCES/Ant40_files/output_anta40_mod-0.4.f90

@@ -95 +95 @@
   do k=1,nvar
     read(568,'(a100)') namevar(k)
-    print*,trim(namevar(k))
     read(568,'(a100)') standard_name(k)
-    print*,trim(standard_name(k))
     read(568,'(a100)') long_name(k)
-    print*,trim(long_name(k))
     read(568,'(a100)') units(k)
-    print*,trim(units(k))
     read(568,*)
   enddo
   close(568)
-  print*,'apres lecture fichier descriptions variables'
 ! Fichier Netcdf initMIP
 ! creation du fichier Netcdf :
   status=nf90_create(path = 'short'//runname//'.nc', cmode = nf90_clobber, ncid = ncid)
   if (status /= nf90_noerr) call handle_err(status)
-  print*,'apres nf90_create'
 
 ! definition des dimension :
   status=nf90_def_dim(ncid, name="time", len=NF90_UNLIMITED, dimid=timeDimID)
   if (status /= nf90_noerr) call handle_err(status)
-  print*,'apres 2'
   status=nf90_def_var(ncid, name="time", xtype=nf90_float, dimids=(/ timeDimID/), varid=timeVarID) 
   if (status /= nf90_noerr) call handle_err(status)
   status=nf90_put_att(ncid, timeVarID, "standard_name", "time")
   if (status /= nf90_noerr) call handle_err(status)
-  print*,'apres 3'
   status=nf90_put_att(ncid, timeVarID,"units", "years since 2007-01-01 00:00:00")
   if (status /= nf90_noerr) call handle_err(status)
-  print*,'apres 4'
 
 ! definition des variables de sortie :
@@ -129 +120 @@
     status=nf90_def_var(ncid, name=trim(namevar(k)), xtype=nf90_float, dimids= &
           (/ timeDimID /), varid=varID(k))
-  print*,'apres 5'
     if (status /= nf90_noerr) call handle_err(status)
     status=nf90_put_att(ncid, varID(k), "standard_name", trim(standard_name(k)))
-    print*,'apres 6',trim(standard_name(k))
     if (status /= nf90_noerr) call handle_err(status)
     status=nf90_put_att(ncid, varID(k), "long_name", trim(long_name(k)))
-    print*,'apres 7',trim(long_name(k))
     if (status /= nf90_noerr) call handle_err(status)
     status=nf90_put_att(ncid, varID(k), "units", trim(units(k)))
-    print*,'apres 8', trim(units(k))
     if (status /= nf90_noerr) call handle_err(status)
   enddo
-  print*,'apres boucle'
 
 ! fin de la definition du fchier :
@@ -284 +270 @@
 !940   format('%%%% ',a,'   time=',f8.0,' %%%%')
 
-print*, 'dans shortoutput avant netcdf ncshortout', ncshortout
 
 if (ncshortout.eq.1) then  ! ecriture netcdf
@@ -305 +290 @@
 
   nbtimeout=nbtimeout+1
-  print*,'ecriture shortnc', nbtimeout
+  
   status=nf90_put_var(ncid, timeVarID, time, start=(/nbtimeout/))
   if (status /= nf90_noerr) call handle_err(status)

trunk/SOURCES/bilan_flux_output_mod.f90

@@ -81 +81 @@
 
 
-
-
 ! calcul de la moyenne des flux sur dtoutflux
-if ((mod(abs(time),dtoutflux).lt.dtmin).and.(abs(dtsum-dtoutflux).lt.dtmin)) then
+!if ((mod(abs(time),dtoutflux).lt.dtmin).and.(abs(dtsum-dtoutflux).lt.dtmin)) then
+if (mod(abs(time),dtoutflux).lt.dtmin) then
   bm_flux(:,:)=bm_flux(:,:)/dtsum
   bmelt_flux(:,:)=bmelt_flux(:,:)/dtsum
@@ -92 +91 @@
 
 ! sorties dans debug_3d:
-  debug_3d(:,:,87) = bm_flux(:,:)      ! acabf
+  debug_3d(:,:,106) = bm_flux(:,:)      ! acabf
   debug_3d(:,:,107) = bmelt_flux(:,:)   ! libmassbf
   debug_3d(:,:,108) = dhdt_flux(:,:)    ! dlithkdt
@@ -99 +98 @@
 
 ! remise a 0
+  dtsum = 0.
   bm_flux(:,:)      = 0.
   bmelt_flux(:,:)   = 0.
@@ -105 +105 @@
   grline_flux(:,:)  = 0.
   
-else if (abs(dtsum-dtoutflux).lt.dtmin) then
-  print*,'pb sorties flux dtoutflux : time=', time
-  print*,'dtsum=',dtsum,' dtoutflux', dtoutflux
-else if (mod(abs(time),dtoutflux).lt.dtmin) then
-  print*,'pb sorties flux dtsum : time=', time
-  print*,'dtsum=',dtsum,' dtoutflux', dtoutflux
+!~ else if (abs(dtsum-dtoutflux).lt.dtmin) then
+!~   print*,'pb sorties flux dtoutflux : time=', time
+!~   print*,'dtsum=',dtsum,' dtoutflux', dtoutflux
+!~ else if (mod(abs(time),dtoutflux).lt.dtmin) then
+!~   print*,'pb sorties flux dtsum : time=', time
+!~   print*,'dtsum=',dtsum,' dtoutflux', dtoutflux
 endif
 

trunk/SOURCES/calving_frange.f90

@@ -403 +403 @@
                      S(i,j)=H(i,j)*(1.-ro/row) + sealevel
                      B(i,j)=S(i,j) - H(i,j)
+          ! ATTENTION ne pas mettre ice=0 sinon degradation bilan d'eau (bm et bmelt non comptabilises dans ce cas)
                    endif  
 
@@ -419 +420 @@
        endwhere   
       
-       calv_dtt(:,:) = calv_dtt(:,:) + calv(:,:) ! somme du calving sur dtt   
-       ! calv_dtt est remis à 0 dans bilan_eau (tous les dtt)
+       calv_dtt(:,:) = calv_dtt(:,:) + calv(:,:) ! somme du calving sur dtt  
+       ! calv_dtt est remis a 0 dans steps_time_loop (tous les dtt)
     end subroutine calving
 !------------------------------------------------------------------------------------------

trunk/SOURCES/flottab2-0.7.f90

@@ -68 +68 @@
  integer ::  numtache
  integer ::  nb_pt
+ real    ::  petit_H=0.001 ! pour test ice sur zone flottante
 contains
 ! -----------------------------------------------------------------------------------
@@ -593 +594 @@
     where (flot(:,:))
 !cdc 1m       where (H(:,:).gt.max(Hmin,Hmin+BM(:,:)-Bmelt(:,:)))
-                         where (H(:,:).gt.0.)
+      where (H(:,:).gt.max(BM(:,:)-Bmelt(:,:)+petit_H,0.)*dt)
+!cdc                     where (H(:,:).gt.0.)
           ice(:,:)=1
        elsewhere 

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

@@ -213 +213 @@
 
 
-
-  if (iter_beta.eq.0) then
-
-     if (itracebug.eq.1)  call tracebug(' Avant appel routine icethick3')
-     call icethick3
-     debug_3D(:,:,88) = S(:,:)
-     if (itracebug.eq.1)  call tracebug(' Apres appel routine icethick3')
-  end if
+!cdc supprime pour initialisation propre
+!~   if (iter_beta.eq.0) then
+
+!~      if (itracebug.eq.1)  call tracebug(' Avant appel routine icethick3')
+!~      call icethick3
+!~      debug_3D(:,:,88) = S(:,:)
+!~      if (itracebug.eq.1)  call tracebug(' Apres appel routine icethick3')
+!~   end if
 
 

trunk/SOURCES/steps_time_loop.f90

@@ -57 +57 @@
 
      call icethick3
-
      call flottab
-
      call calving
-
      call ablation_bord
-
      call bilan_eau
      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
+
+!~      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
@@ -161 +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 

trunk/SOURCES/util_recovery.f90

@@ -101 +101 @@
          (TIME .EQ. TEND).OR.(ipredef.eq.1) )    THEN
 
-       print*,'sortie cptr time ipredef:',time, ipredef
        if (ipredef .EQ. 1) then
          ! pour changer de signe entre le passe et le futur
@@ -109 +108 @@
           signe= '-'
          endif
-
 
         if (int(mod(abs(tab_time(indice)),1000.)).eq.0) then
@@ -129 +127 @@
         endif
         filin=runname//signe//unite//trim(ADJUSTL(ntime))
-        print*,'sortie cptr filin=',filin
 
       else !ipredef==0