Changeset 144 for trunk/SOURCES

Timestamp:

10/17/17 19:24:28 (7 years ago)

Author:

aquiquet

Message:

Series of minor bug corrections for initMIP Antarctica configuration

Location:

trunk/SOURCES

Files:

• Ant16_files/bmelt-ant-regions-initmip_mod.f90 (modified) (1 diff)
• Ant16_files/climat_InitMIP_years_perturb_mod.f90 (modified) (1 diff)
• Ant40_files/output_anta40_mod-0.4.f90 (modified) (1 diff)
• bilan_flux_output_mod.f90 (modified) (2 diffs)
• mix-SIA-L1_mod.f90 (modified) (1 diff)

trunk/SOURCES/Ant16_files/bmelt-ant-regions-initmip_mod.f90

@@ -149 +149 @@
     real             :: coefanomtime
 
-    coefanomtime = min ( real(time/50.) , 1. ) 
+    coefanomtime = min ( real(time/40.) , 1. ) 
     if (bmelt_time.eq.0) then
        bmshelf(:,:) = bmshelf_0(:,:)

trunk/SOURCES/Ant16_files/climat_InitMIP_years_perturb_mod.f90

@@ -255 +255 @@
   real             :: coefanomtime
 
-  coefanomtime = min ( real(time/50.) , 1. ) 
+  coefanomtime = min ( real(time/40.) , 1. ) 
   if (massb_time.eq.0) then
      bm(:,:) = bm_0(:,:)

trunk/SOURCES/Ant40_files/output_anta40_mod-0.4.f90

@@ -49 +49 @@
 
 real,dimension(nx,ny) :: corrsurf     !< facteur de correction de la surface
-real,parameter :: ice_density=910.    !< densite de la glace pour conversion en masse
+!real,parameter :: ice_density=910.    !< densite de la glace pour conversion en masse
 
 ! variables netcdf

trunk/SOURCES/bilan_flux_output_mod.f90

@@ -32 +32 @@
 !integer,dimension(nx,ny) :: gr_line        ! point grounding line (pose sous niveau de la mer avec point flottant a cote)
 
-
+real,parameter :: ice_density=910.    !< densite de la glace pour conversion en masse
 
 contains
@@ -84 +84 @@
 !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
-  dhdt_flux(:,:)=dhdt_flux(:,:)/dtsum
-  calving_flux(:,:)=calving_flux(:,:)/dtsum
-  grline_flux(:,:)=grline_flux(:,:)/dtsum
+  bm_flux(:,:)=(bm_flux(:,:)/dtsum)*ice_density/secyear
+  bmelt_flux(:,:)=(bmelt_flux(:,:)/dtsum)*ice_density/secyear
+  dhdt_flux(:,:)=(dhdt_flux(:,:)/dtsum)/secyear
+  calving_flux(:,:)=(calving_flux(:,:)/dtsum)*ice_density/secyear
+  grline_flux(:,:)=(grline_flux(:,:)/dtsum)*ice_density/secyear
 
 ! sorties dans debug_3d:

trunk/SOURCES/mix-SIA-L1_mod.f90

@@ -175 +175 @@
 
   !$OMP WORKSHARE
-  debug_3d(:,:,111) = (ux  (:,:,1)  + eoshift( ux(:,:,1) ,shift=1,boundary=0.,dim=1))/2.
-  debug_3d(:,:,112) = (uy  (:,:,1)  + eoshift( uy(:,:,1) ,shift=1,boundary=0.,dim=2))/2.
-  debug_3d(:,:,113) = uzr (:,:,1) * ice(:,:)
-  debug_3d(:,:,114) = (ux  (:,:,nz) + eoshift( ux(:,:,nz),shift=1,boundary=0.,dim=1))/2.
-  debug_3d(:,:,115) = (uy  (:,:,nz) + eoshift( uy(:,:,nz),shift=1,boundary=0.,dim=2))/2.
-  debug_3d(:,:,116) = uzr (:,:,nz) * ice(:,:)
+  debug_3d(:,:,111) = ( (ux  (:,:,1)  + eoshift( ux(:,:,1) ,shift=1,boundary=0.,dim=1))/2.  )/secyear
+  debug_3d(:,:,112) = ( (uy  (:,:,1)  + eoshift( uy(:,:,1) ,shift=1,boundary=0.,dim=2))/2.  )/secyear
+  debug_3d(:,:,113) = ( uzr (:,:,1) * ice(:,:)                                              )/secyear
+  debug_3d(:,:,114) = ( (ux  (:,:,nz) + eoshift( ux(:,:,nz),shift=1,boundary=0.,dim=1))/2.  )/secyear
+  debug_3d(:,:,115) = ( (uy  (:,:,nz) + eoshift( uy(:,:,nz),shift=1,boundary=0.,dim=2))/2.  )/secyear
+  debug_3d(:,:,116) = ( uzr (:,:,nz) * ice(:,:)                                             )/secyear
   !$OMP END WORKSHARE