Changeset 123 for branches/iLoveclim/SOURCES/Greeneem_files

Timestamp:

06/30/17 18:22:26 (7 years ago)

Author:

aquiquet

Message:

Merged branch iLOVECLIM to trunk at rev 121

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/Greeneem_files/lect-greeneem_mod.f90 (modified) (1 diff)
• SOURCES/Greeneem_files/output_greeneem_mod-0.4.f90 (modified) (3 diffs)

branches/iLoveclim/SOURCES/Greeneem_files/lect-greeneem_mod.f90

@@ -79 +79 @@
     call lect_input(1,'H',1,H,topo_dep,file_ncdf)          ! epaisseur
     S(:,:)=max(S(:,:),0.)   ! pour etre au niveau des mers : ATTENTION si SEALEV <0
-    H(:,:)=max(H(:,:),1.)   ! pour avoir au moins 1 m
+    H(:,:)=max(H(:,:),0.)   ! pas d epaisseurs negatives
 
           

branches/iLoveclim/SOURCES/Greeneem_files/output_greeneem_mod-0.4.f90

@@ -48 +48 @@
 mask_cal(:,:,:)=.false.
 mask_cal(:,:,1)=.true.
+sum_H_old = sum(H(:,:),mask=ice(:,:)==1)
 do j=1,ny
    do i=1,nx
@@ -65 +66 @@
 WRITE(num_ritz, '(a134)')         "! IS         :      1      2      3      4      5      6      7      8      9     10     11     12     13     14     15     16     17 "
 WRITE(num_ritz, '(a21,16(5x,i2))')'! Greenland  :       ',((i),i=18,33)
-WRITE(num_ritz,*)
 end subroutine init_outshort
 
@@ -168 +168 @@
   enddo
   
+        
+  
 
-  write(num_ritz,905)   time,((isvol(kk),inp(kk),isvolf(kk),isvol_shelf(kk),inf(kk),isacc(kk),isabl(kk),    &  
-       isablbord(kk),ablatot(kk),iscalv(kk),isbm(kk),Tjulymean(kk),Hmean(kk),Hmax(kk),nabl(kk),nacc(kk)),kk=1,nbregion)    
+!  write(num_ritz,905)   time,((isvol(kk),inp(kk),isvolf(kk),isvol_shelf(kk),inf(kk),isacc(kk),isabl(kk),    &  
+!       isablbord(kk),ablatot(kk),iscalv(kk),isbm(kk),Tjulymean(kk),Hmean(kk),Hmax(kk),nabl(kk),nacc(kk)),kk=1,nbregion)
+
+  write(num_ritz,906) time,diff_H,water_bilan,sum(calv_dtt(2:nx-1,2:ny-1))/dtt, &
+                         sum(ablbord_dtt(2:nx-1,2:ny-1))/dtt, &
+                         sum(Bm_dtt(2:nx-1,2:ny-1))/dtt,sum(bmelt_dtt(2:nx-1,2:ny-1))/dtt,sum(ice(2:nx-1,2:ny-1),mask=ice(2:nx-1,2:ny-1)==1) 
 
 905  format(f10.1,1x,2(e11.4, 1x, i5, 1x, e11.4, 1x, e11.4, 1x, i5, 9(1x, e12.5),2(1x,i5)))
+906  format (f0.2,6(1x,e15.8),1x,i7)
          
 ! pour verifier la zone groenland sur carte