Changeset 442 for branches

Timestamp:

07/03/23 15:32:49 (11 months ago)

Author:

aquiquet

Message:

A few modifications on bmelt-beckmann-gcm, K_t and nbassins are in param_list now

File:

• branches/GRISLIv3/SOURCES/bmelt-beckmann-gcm_mod.f90 (modified) (10 diffs)

branches/GRISLIv3/SOURCES/bmelt-beckmann-gcm_mod.f90

@@ -29 +29 @@
   implicit none
 
-  integer, parameter :: nbassins = 10 !< number of sectors in the ocean
+  real*8,parameter :: cpw    = 4182.d0
+  integer :: nbassins !< number of sectors in the ocean
   integer :: nzoc !< number of vertical levels in the ocean (read in netcdf T/S file)
   real*8 :: coef_OM !combined coefficient by DeConto et Pollard (m/yr/C2)
@@ -45 +46 @@
   real*8, dimension (nx,ny)      :: ice_draft       !< ice draft (S-H)
   character(len=200) :: TO_file, SO_file, Bassin_file   ! fichiers de forcage
-  logical, dimension(nbassins) :: mask_bassin_vide  ! mask true if bassin without any GCM data
+  logical, dimension(:), allocatable :: mask_bassin_vide  ! mask true if bassin without any GCM data
   
 contains
@@ -70 +71 @@
     integer, dimension(:,:,:), allocatable :: mask_gcm  ! mask were T S are defined
     integer, dimension(:,:,:), allocatable :: mask_gcm_init ! mask were T S are defined in GCM before interpolation
-    integer, dimension(nbassins) :: max_depth_bassin ! max level were T S are defined for every bassins
+    integer, dimension(:), allocatable :: max_depth_bassin ! max level were T S are defined for every bassins
     integer :: nmax ! to avoid inifite loop 
     integer :: err
-    namelist/bmelt_beckmann_gcm_mod/TO_file,SO_file,Bassin_file,bmelt_empty
+    namelist/bmelt_beckmann_gcm_mod/K_t,TO_file,SO_file,Bassin_file,nbassins,bmelt_empty
     
     rewind(num_param)        ! loop back at the beginning of the param_list.dat file
@@ -81 +82 @@
     write(num_rep_42,bmelt_beckmann_gcm_mod)
 
-    K_t = 15.77
+    !K_t = 15.77
 
     file_inputs=TRIM(DIRNAMEINP)//'Snapshots-GCM/'//TRIM(TO_file)
@@ -97 +98 @@
        end if
     end if
+    if (.not.allocated(mask_bassin_vide)) then
+      allocate(mask_bassin_vide(nbassins),stat=err)
+      if (err/=0) then
+          print *,"erreur a l'allocation du tableau mask_bassin_vide",err
+          stop 4
+       end if
+    end if
     if (.not.allocated(temp_ocean)) then
       allocate(temp_ocean(nx,ny,nzoc),stat=err)
@@ -136 +144 @@
       if (err/=0) then
           print *,"erreur a l'allocation du tableau mask_gcm_init",err
+          stop 4
+       end if
+    end if
+    if (.not.allocated(max_depth_bassin)) then
+      allocate(max_depth_bassin(nbassins),stat=err)
+      if (err/=0) then
+          print *,"erreur a l'allocation du tableau max_depth_bassin",err
           stop 4
        end if
@@ -178 +193 @@
         
    depth_max_grid=maxval(depth_max(:,:)) ! max depth were T and S are defined in the grid
-   
+
    !$OMP PARALLEL
    if (depth_max_grid.lt.nzoc) then
@@ -310 +325 @@
         !temp_ocean(:,:,:) = temp_ocean(:,:,:) - 273.15
         
-    coef_OM = K_t * 0.01420418516
+    !coef_OM = K_t * 0.01420418516
+    coef_OM = K_t * row * cpw / (cl * ro)
 
     if ( ubound(zoc,dim=1).ne.nzoc) then
@@ -394 +410 @@
        do i=1,nx
           if ( TO_draft(i,j) .gt. -9000.d0 ) then ! floating points
-            if (mask_bassin_vide(bassin(i,j)) .or. (bassin(i,j).eq.1)) then ! bassins without any GCM data or bassin 1
+            !if (mask_bassin_vide(bassin(i,j)) .or. (bassin(i,j).eq.1)) then ! bassins without any GCM data or bassin 1
+            !if (mask_bassin_vide(bassin(i,j)) .or. (bassin(i,j).eq.1)) then !bassins without any GCM data
+            if (mask_bassin_vide(bassin(i,j))) then !bassins without any GCM data
                bmelt(i,j) = bmelt_empty
             else  ! Bassins with GCM data
@@ -412 +430 @@
              ngr=0
              bmloc=0.d0
-             if (TO_draft(i+1,j) .le. -9000.d0 ) then
+             !if (TO_draft(i+1,j) .le. -9000.d0 ) then
+             if (flot(i+1,j)) then
                 ngr=ngr+1
                 bmloc=bmloc+bmelt(i+1,j)
              endif
-             if (TO_draft(i-1,j) .le. -9000.d0 ) then
+             !if (TO_draft(i-1,j) .le. -9000.d0 ) then
+             if (flot(i-1,j)) then
                 ngr=ngr+1
                 bmloc=bmloc+bmelt(i-1,j)
              endif
-             if (TO_draft(i,j+1) .le. -9000.d0 ) then
+             !if (TO_draft(i,j+1) .le. -9000.d0 ) then
+             if (flot(i,j+1)) then
                 ngr=ngr+1
                 bmloc=bmloc+bmelt(i,j+1)
              endif
-             if (TO_draft(i,j-1) .le. -9000.d0 ) then
+             !if (TO_draft(i,j-1) .le. -9000.d0 ) then
+             if (flot(i,j-1)) then
                 ngr=ngr+1
                 bmloc=bmloc+bmelt(i,j-1)
              endif
+             ngr=0   ! afq -- I do not allow subgrid ocean melt
              bmelt(i,j)=(ngr/4.)*bmloc+(1-ngr/4.)*bmelt(i,j) 
           endif