Changeset 145

Timestamp:

10/19/17 18:07:33 (7 years ago)

Author:

aquiquet

Message:

Finalising initMIP Antarctica outputs, this revision has been used to generate what we uploaded on the initMIP ftp.

Location:

trunk/SOURCES

Files:

• Fichiers-parametres/ant16km_LISTE-VAR-NETCDF.dat (modified) (1 diff)
• Netcdf-routines/Description_Variables.dat (modified) (1 diff)
• Temperature-routines/icetemp_mod.f90 (modified) (1 diff)
• bilan_eau_mod.f90 (modified) (2 diffs)
• bilan_flux_output_mod.f90 (modified) (3 diffs)
• flottab2-0.7.f90 (modified) (1 diff)
• out_cptr_mod.f90 (modified) (1 diff)

trunk/SOURCES/Fichiers-parametres/ant16km_LISTE-VAR-NETCDF.dat

@@ -790 +790 @@
 1       1       1
 -----------------------------------------------------------
+litempbot
+220
+1       1       1
+-----------------------------------------------------------
                                         
 ==========================================================

trunk/SOURCES/Netcdf-routines/Description_Variables.dat

@@ -1528 +1528 @@
 "Floating ice sheet area fraction"                        !~  description 
 ------------------------------------------------------
+"litempbot"                        ! nom de la variable
+220      litempbot     5          ! number, name in grisli, class
+"o"                                ! node type : "o" ,"^", ">"
+"land_ice_basal_temperature"                       !~  long name
+"land_ice_basal_temperature"                        !~  standard name
+"K"                                 !~  unit 
+"Basal temperature"                        !~  description 
+------------------------------------------------------
+

trunk/SOURCES/Temperature-routines/icetemp_mod.f90

@@ -305 +305 @@
 !~            nx,ny,temps,t_cpu,norme
 
-
+    debug_3D(:,:,120) = T(:,:,nz)+273.15
+    
     If (Itracebug.Eq.1) Write(num_tracebug,*)' fin routine icetemp'
     return

trunk/SOURCES/bilan_eau_mod.f90

@@ -95 +95 @@
 do j=1,ny
   do i=1,nx
-    if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.).and.(Bsoc(i,j).LE.sealevel)) then ! grounded with ice
+     !afq    if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.).and.(Bsoc(i,j).LE.sealevel)) then ! grounded with ice
+     if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.)) then ! grounded with ice
       if (archimtab(i-1,j).LT.0..and.Uxbar(i,j).LT.0..and..not.flot_marais(i-1,j)) gr_line(i,j)=1
       if (archimtab(i+1,j).LT.0..and.Uxbar(i+1,j).GT.0..and..not.flot_marais(i+1,j)) gr_line(i,j)=1
@@ -107 +108 @@
 !~   grline_dtt(:,:)= (((uxbar(:,:)+eoshift(uxbar(:,:),shift=1,boundary=0.,dim=1))**2+ &
 !~                     (uybar(:,:)+eoshift(uybar(:,:),shift=1,boundary=0.,dim=2))**2)**0.5)*0.5 &
-!~                     *H(:,:) + grline_dtt(:,:)
-  grline_dtt(:,:)= (abs(uxbar(:,:)+eoshift(uxbar(:,:),shift=1,boundary=0.,dim=1))/2.*dy + &
-                    abs(uybar(:,:)+eoshift(uybar(:,:),shift=1,boundary=0.,dim=2))/2.*dx)  &
-                    *H(:,:) + grline_dtt(:,:)             
+!~                     *H(:,:) + grline_dtt(:,:) 
+   grline_dtt(:,:)= - sqrt(                                                                        &
+                           ( (uxbar(:,:)+eoshift(uxbar(:,:),shift=1,boundary=0.,dim=1))*dy/2. )**2 +  &
+                           ( (uybar(:,:)+eoshift(uybar(:,:),shift=1,boundary=0.,dim=2))*dx/2. )**2 )  &
+                           * H(:,:) * dt + grline_dtt(:,:)
 endwhere
 

trunk/SOURCES/bilan_flux_output_mod.f90

@@ -66 +66 @@
    bm_flux(2:nx-1,2:ny-1) = bm_flux(2:nx-1,2:ny-1) + bm(2:nx-1,2:ny-1)*dt          ! somme Bm sur dt
    bmelt_flux(2:nx-1,2:ny-1) = bmelt_flux(2:nx-1,2:ny-1) + bmelt(2:nx-1,2:ny-1)*dt + ablbord(2:nx-1,2:ny-1)  ! somme bmelt sur dt
-   dhdt_flux(2:nx-1,2:ny-1) = dhdt_flux(2:nx-1,2:ny-1) + (H(2:nx-1,2:ny-1)-vieuxH_flux(2:nx-1,2:ny-1))*dt    ! somme dhdt  sur dt    
+   dhdt_flux(2:nx-1,2:ny-1) = dhdt_flux(2:nx-1,2:ny-1) + (H(2:nx-1,2:ny-1)-vieuxH_flux(2:nx-1,2:ny-1))       ! somme dhdt  sur dt    
 endwhere
 
@@ -75 +75 @@
 !~                     (uybar(:,:)+eoshift(uybar(:,:),shift=1,boundary=0.,dim=2))**2)**0.5)*0.5 &
 !~                     *H(:,:) + grline_flux(:,:)
-  grline_flux(:,:)= (abs(uxbar(:,:)+eoshift(uxbar(:,:),shift=1,boundary=0.,dim=1))/2.*dy + &
-                     abs(uybar(:,:)+eoshift(uybar(:,:),shift=1,boundary=0.,dim=2))/2.*dx)  &
-                    *H(:,:) + grline_flux(:,:)                      
+   grline_flux(:,:)= - sqrt(                                                                       &
+                            ( (uxbar(:,:)+eoshift(uxbar(:,:),shift=1,boundary=0.,dim=1))*dy/2. )**2 +  &
+                            ( (uybar(:,:)+eoshift(uybar(:,:),shift=1,boundary=0.,dim=2))*dx/2. )**2 )  &
+                           * H(:,:) * dt /(dx*dy) + grline_flux(:,:)
 endwhere
 
@@ -88 +89 @@
   dhdt_flux(:,:)=(dhdt_flux(:,:)/dtsum)/secyear
   calving_flux(:,:)=(calving_flux(:,:)/dtsum)*ice_density/secyear
-  grline_flux(:,:)=(grline_flux(:,:)/dtsum)*ice_density/secyear
+  grline_flux(:,:)= (grline_flux(:,:)/dtsum)*ice_density/secyear 
 
 ! sorties dans debug_3d:
-  debug_3d(:,:,106) = bm_flux(:,:)      ! acabf
-  debug_3d(:,:,107) = bmelt_flux(:,:)   ! libmassbf
-  debug_3d(:,:,108) = dhdt_flux(:,:)    ! dlithkdt
-  debug_3d(:,:,109) = calving_flux(:,:) ! licalvf
-  debug_3d(:,:,110) = grline_flux(:,:)  ! ligroundf
+  debug_3d(:,:,106) = bm_flux(:,:)       ! acabf
+  debug_3d(:,:,107) = -bmelt_flux(:,:)   ! libmassbf
+  debug_3d(:,:,108) = dhdt_flux(:,:)     ! dlithkdt
+  debug_3d(:,:,109) = calving_flux(:,:)  ! licalvf
+  debug_3d(:,:,110) = grline_flux(:,:)   ! ligroundf
 
 ! remise a 0

trunk/SOURCES/flottab2-0.7.f90

@@ -749 +749 @@
 
     ! pour sorties initMIP:
-    debug_3D(:,:,118) =  1-ice(:,:)
+    debug_3D(:,:,118) = ice(:,:)*(1-mk(:,:))
     debug_3D(:,:,119) = ice(:,:)*mk(:,:)
 

trunk/SOURCES/out_cptr_mod.f90

@@ -312 +312 @@
      Uyflgz(:,:) = Uy(:,:,nz)
 
+     debug_3D(:,:,120) = T(:,:,nz) + 273.15