Changeset 115 for trunk

Timestamp:

06/20/17 14:46:35 (7 years ago)

Author:

dumas

Message:

New subroutine lect_vitbil_Lebrocq : choose between lect_vitbil and lect_vitbil_Lebrocq with type_vitbil flag in param_list

File:

• trunk/SOURCES/spinup_mod.f90 (modified) (8 diffs)

trunk/SOURCES/spinup_mod.f90

@@ -23 +23 @@
   use deformation_mod_2lois
   use interface_input
+  use io_netcdf_grisli
+  
   implicit none
 
@@ -39 +41 @@
   real, dimension(nx,ny) :: Vsl_x             !<
   real, dimension(nx,ny) :: Vsl_y             !<
+  
+  integer :: type_vitbil ! defini le type de fichier a lire : lect_vitbil ou lect_vitbil_Lebrocq
 
 contains
@@ -47 +51 @@
   !<
   subroutine init_spinup
-  namelist/spinup/ispinup
+  namelist/spinup/ispinup,type_vitbil
 
     ! put here which type of spinup
@@ -79 +83 @@
 write(num_rep_42,*)'! ispinup = 2     conservation de la masse avec vitesses bilan '
 write(num_rep_42,*)'! ispinup = 3     equilibre temperature avec vitesses bilan'
+write(num_rep_42,*)'! type_vitbil type de lecture des vitesses de bilan 1: lect_vitbil, 2 : lect_vitbil_Lebrocq'
 write(num_rep_42,*)
 
@@ -88 +93 @@
 endif
 
-
-    call lect_vitbil
+select case (type_vitbil)
+case (1)
+!cdc Methode Cat lecture fichier selon x et y sur grille stag
+  call lect_vitbil
+case(2)
+!cdc Methode Tof lecture fichier Lebrocq vitesse et direction
+  call lect_vitbil_Lebrocq
+case default
+  print*,'type_vitbil valeur invalide dans spinup_vitbil'
+end select
 
     if (itracebug.eq.1)  call tracebug(' fin routine init_spinup de spinup_vitbil')
@@ -96 +109 @@
   subroutine lect_vitbil
 
-
     character(len=100) :: balance_Ux_file        !  balance velocity file Ux
     character(len=100) :: balance_Uy_file        !  balance velocity file Uy
-
+          real*8, dimension(:,:),   pointer    :: tab               !< tableau 2d real pointer
+          
     namelist/vitbil_upwind/balance_Ux_file, balance_Uy_file  
 
@@ -122 +135 @@
     balance_Ux_file = trim(dirnameinp)//trim(balance_Ux_file)
     balance_Uy_file = trim(dirnameinp)//trim(balance_Uy_file)
-
-    call lect_input(1,'Vcol_x',1,Vcol_x,balance_Ux_file,"")
-    call lect_input(1,'Vcol_y',1,Vcol_y,balance_Uy_file,"")
+    
+    call Read_Ncdf_var('Vcol_x',balance_Ux_file,tab)
+    Vcol_x(:,:)=tab(:,:)
+    call Read_Ncdf_var('Vcol_y',balance_Uy_file,tab)
+    Vcol_y(:,:)=tab(:,:)
 
 !    call lect_input(2,'Vcol',1,Vcol_x,balance_vel_file,trim(dirnameinp)//trim(runname)//'.nc')  !read Vcol_x
@@ -135 +150 @@
 
   end subroutine lect_vitbil
+  
+  subroutine lect_vitbil_Lebrocq
+
+
+    character(len=100) :: vit_balance_file        !  balance velocity file
+    character(len=100) :: flowdir_balance_file    !  balance flow direction file
+    real*8, dimension(:,:),   pointer    :: tab               !< tableau 2d real pointer
+    real, dimension(nx,ny) :: V_Lebrocq           !< vertically averaged velocity (balance)
+    real, dimension(nx,ny) :: flowdir_Lebrocq     !< flow direction (degree)
+    real, dimension(nx,ny) :: Vx_Lebrocq, Vy_Lebrocq ! vitesses selon x et y
+    
+    namelist/vitbil_Lebrocq/vit_balance_file, flowdir_balance_file  
+
+    if (itracebug.eq.1)  call tracebug(' Subroutine lect_vitbil_Lebrocq') 
+
+    ! lecture des parametres du run                    
+    !--------------------------------------------------------------------
+
+    rewind(num_param)        ! pour revenir au debut du fichier param_list.dat
+428 format(A)
+    read(num_param,vitbil_Lebrocq)
+
+    write(num_rep_42,428) '!___________________________________________________________' 
+    write(num_rep_42,428) '!read balance velocities from Lebrocq code'
+    write(num_rep_42,vitbil_Lebrocq)                    
+    write(num_rep_42,428) '! vit_balance_file : balance velocity file'
+    write(num_rep_42,428) '! flowdir_balance_file : balance flow direction file'
+    write(num_rep_42,*)
+
+    ! read balance velocities on staggered nodes
+    
+    vit_balance_file = trim(dirnameinp)//trim(vit_balance_file)
+    flowdir_balance_file = trim(dirnameinp)//trim(flowdir_balance_file)
+    
+    call Read_Ncdf_var('z',vit_balance_file,tab)
+    V_Lebrocq(:,:)=tab(:,:)
+    call Read_Ncdf_var('z',flowdir_balance_file,tab)
+    flowdir_Lebrocq(:,:)=tab(:,:)*PI/180.
+
+                ! calcul des vitesses selon x et selon y :
+                where (V_Lebrocq(:,:).ge.0.)
+                        Vx_Lebrocq(:,:) = V_Lebrocq(:,:)*sin(flowdir_Lebrocq(:,:))
+                        Vy_Lebrocq(:,:) = V_Lebrocq(:,:)*cos(flowdir_Lebrocq(:,:))
+                elsewhere
+                        Vx_Lebrocq(:,:) = 0.
+                        Vy_Lebrocq(:,:) = 0.
+                endwhere
+                
+                ! calcul des vitesses sur les points staggered
+                
+                do j=2,ny
+                        do i=2,nx
+                                Vcol_x(i,j) = (Vx_Lebrocq(i-1,j) + Vx_Lebrocq(i,j))/2.
+                                Vcol_y(i,j) = (Vy_Lebrocq(i,j-1) + Vy_Lebrocq(i,j))/2.
+                        enddo
+                enddo
+
+  end subroutine lect_vitbil_Lebrocq 
   !____________________________________________________________________________________