Changeset 450

Timestamp:

12/01/23 10:04:04 (6 months ago)

Author:

aquiquet

Message:

Cleaning branch: some cleaning and update of GrIce2sea geometry

Location:

branches/GRISLIv3

Files:

• SOURCES/Alps_files/module_choix-alps.f90 (modified) (2 diffs)
• SOURCES/Ant16_files/bmelt-ant-regions-larmip_mod.f90 (modified) (5 diffs)
• SOURCES/Ant16_files/module_choix-ant16km.f90 (modified) (1 diff)
• SOURCES/Ant40_files/module_choix-antar40-0.4.f90 (modified) (2 diffs)
• SOURCES/Eurasie_files/module_choix-eurasie.f90 (modified) (2 diffs)
• SOURCES/GrIce2sea_files/fake-routines_Grice2sea_mod.f90 (modified) (3 diffs)
• SOURCES/GrIce2sea_files/lect_GrIce2sea_gen_nc.f90 (modified) (2 diffs)
• SOURCES/GrIce2sea_files/module_choix_GrIce2sea.f90 (modified) (2 diffs)
• SOURCES/GrIce2sea_files/output_Grice2sea_mod.f90 (modified) (4 diffs)
• SOURCES/Grismip6_files/module_choix-grismip6.f90 (modified) (1 diff)
• SOURCES/Hemin15_files/module_choix-hemin15.f90 (modified) (1 diff)
• SOURCES/Hemin40_files/module_choix-hemin40-0.4.f90 (modified) (1 diff)
• SOURCES/Laure16_files/module_choix-laurentide.f90 (modified) (1 diff)
• SOURCES/MISMIP3D_files/fake-routines-mismip3d_mod.f90 (modified) (1 diff)
• SOURCES/MISMIP3D_files/module_choix_mismip3d.f90 (modified) (1 diff)
• SOURCES/Makefile.grisli.inc (modified) (3 diffs)
• SOURCES/bmelt-ismip6-param_mod.f90 (modified) (1 diff)
• SOURCES/main3D-0.4-40km.f90 (modified) (1 diff)
• TRASH-SOURCES/climat_GrIce2sea_mod.f90 (moved) (moved from branches/GRISLIv3/SOURCES/GrIce2sea_files/climat_GrIce2sea_mod.f90)
• TRASH-SOURCES/dragging_stream_impose_vitbil_mod.f90 (moved) (moved from branches/GRISLIv3/SOURCES/Ant40_files/dragging_stream_impose_vitbil_mod.f90)
• TRASH-SOURCES/lect-clim-act-anteis_mod.f90 (moved) (moved from branches/GRISLIv3/SOURCES/Ant40_files/lect-clim-act-anteis_mod.f90)
• TRASH-SOURCES/lect_climat_ref_Ice2sea_mod.f90 (moved) (moved from branches/GRISLIv3/SOURCES/GrIce2sea_files/lect_climat_ref_Ice2sea_mod.f90)
• TRASH-SOURCES/lect_climat_years_Ice2sea_mod.f90 (moved) (moved from branches/GRISLIv3/SOURCES/GrIce2sea_files/lect_climat_years_Ice2sea_mod.f90)
• TRASH-SOURCES/massb-GrIce2sea_RCM.f90 (moved) (moved from branches/GRISLIv3/SOURCES/GrIce2sea_files/massb-GrIce2sea_RCM.f90)
• TRASH-SOURCES/massb-GrIce2sea_fixe.f90 (moved) (moved from branches/GRISLIv3/SOURCES/GrIce2sea_files/massb-GrIce2sea_fixe.f90)
• TRASH-SOURCES/massb-ant_forcage-0.4.f (moved) (moved from branches/GRISLIv3/SOURCES/Ant40_files/massb-ant_forcage-0.4.f)
• TRASH-SOURCES/massb-ant_perturb-0.4.f (moved) (moved from branches/GRISLIv3/SOURCES/Ant40_files/massb-ant_perturb-0.4.f)
• TRASH-SOURCES/massb-ant_perturb_Tparam.f90 (moved) (moved from branches/GRISLIv3/SOURCES/Ant40_files/massb-ant_perturb_Tparam.f90)
• TRASH-SOURCES/massb-grice2sea_perturb_Tparam.f90 (moved) (moved from branches/GRISLIv3/SOURCES/GrIce2sea_files/massb-grice2sea_perturb_Tparam.f90)
• TRASH-SOURCES/massbal-anteis-0.2.f (moved) (moved from branches/GRISLIv3/SOURCES/Ant40_files/massbal-anteis-0.2.f)
• TRASH-SOURCES/massbal_GrIce2sea_doc.f90 (moved) (moved from branches/GRISLIv3/SOURCES/GrIce2sea_files/massbal_GrIce2sea_doc.f90)

branches/GRISLIv3/SOURCES/Alps_files/module_choix-alps.f90

@@ -10 +10 @@
 !! @note Used modules:
 !! @note   - use lect_topo_hemin40    
-!! @note   - use lect_clim_act_hemin40
 !! @note   - use climat_forcage_mod
 !! @note   - use no_rsl
@@ -42 +41 @@
 !--------------Lecture climat ref ------------------
 ! Le climat de ref si necessaire est maintenant lu par le module de climat directement
-!use lect_clim_act_anteis
 !use lect_clim_act_hemin40 ! pour l'hemisphere nord et l'eurasie
 ! use  climat_heino

branches/GRISLIv3/SOURCES/Ant16_files/bmelt-ant-regions-larmip_mod.f90

@@ -14 +14 @@
 MODULE  BMELT_ANT_REGIONS_LARMIP         ! cat juillet 2005 - afq 2018
 
-  use module3D_phy
-  use netcdf
-  use io_netcdf_grisli
+  !use module3D_phy
+  !use netcdf
+  !use io_netcdf_grisli
+  use geography, only: nx,ny
   
   implicit none
@@ -40 +41 @@
   subroutine init_bmelt
 
+    use geography, only: dirnameinp
+    use module3D_phy, only: num_param,num_rep_42,bsoc,debug_3D
+    use io_netcdf_grisli, only: read_ncdf_var
 
     ! Cette routine fait l'initialisation pour la fusion basale.
@@ -51 +55 @@
     character(len=100) :: file_dist_talus ! fichier distance au talus
     
-  real                  :: bmelt_anomval        !< pour l'anomalie de bmelt appliquee
-  integer               :: bmelt_anomreg        !< sur quelle region on applique l'anomalie
-  real,dimension(nx,ny) :: reg_larmip           !< regions larmip
-  real,dimension(nx,ny) ::  bmgrz_0               !< fusion basale a la grounding zone
-  real,dimension(nx,ny) ::  bmshelf_0             !< fusion basale sous shelf
+    real                  :: bmelt_anomval        !< pour l'anomalie de bmelt appliquee
+    integer               :: bmelt_anomreg        !< sur quelle region on applique l'anomalie
+    real,dimension(nx,ny) :: reg_larmip           !< regions larmip
+    real,dimension(nx,ny) ::  bmgrz_0               !< fusion basale a la grounding zone
+    real,dimension(nx,ny) ::  bmshelf_0             !< fusion basale sous shelf
+
+    integer :: i,j
 
     namelist/bmelt_ant_reg_initmip/bmelt_regions,bmgrz_regions,  &  
@@ -176 +182 @@
   subroutine bmeltshelf
 
+    use module3D_phy, only: bsoc,flot,bmelt,corrbmelt,coefbmshelf,fbm,igrdline,debug_3D &
+                           ,hdot
+
+    implicit none
 
     ! cette routine calcule la fusion basale proprement dite
@@ -181 +191 @@
     integer :: ngr           ! nombre de voisins flottants
     real :: coef_talus       ! pour ne pas changer la fusion au dessus de l'ocean profond
-
+    integer :: i,j
     
     do j=2,ny-1

branches/GRISLIv3/SOURCES/Ant16_files/module_choix-ant16km.f90

@@ -10 +10 @@
 !! @note Used modules
 !! @note   - use lect_topo_anteis    
-!! @note   - use lect_clim_act_anteis
 !! @note   - use climat_perturb_mod
 !! @note   - use no_lakes

branches/GRISLIv3/SOURCES/Ant40_files/module_choix-antar40-0.4.f90

@@ -10 +10 @@
 !! @note Used modules
 !! @note   - use lect_topo_anteis    
-!! @note   - use lect_clim_act_anteis
 !! @note   - use climat_perturb_mod
 !! @note   - use no_rsl
@@ -37 +36 @@
 !use lect_topo_nord40    ! pour l'hemisphere nord 40 km
 !use lect_topo_eurasie   ! pour l'eurasie  (toute resolutions)
-
-!--------------Lecture climat ref ------------------
-! Le climat de ref si necessaire est maintenant lu par le module de climat directement
-!use lect_clim_act_anteis
-
 
 !--------------Lecture climat forcage---------------

branches/GRISLIv3/SOURCES/Eurasie_files/module_choix-eurasie.f90

@@ -10 +10 @@
 !! @note Used modules:
 !! @note   - use lect_topo_hemin40    
-!! @note   - use lect_clim_act_hemin40
 !! @note   - use climat_forcage_mod
 !! @note   - use no_rsl
@@ -41 +40 @@
 !--------------Lecture climat ref ------------------
 ! Le climat de ref si necessaire est maintenant lu par le module de climat directement
-!use lect_clim_act_anteis
 !use lect_clim_act_hemin40 ! pour l'hemisphere nord et l'eurasie
 ! use  climat_heino

branches/GRISLIv3/SOURCES/GrIce2sea_files/fake-routines_Grice2sea_mod.f90

@@ -13 +13 @@
 
 module fake_grice2sea
-
-use module3d_phy
 
 implicit none
@@ -33 +31 @@
 subroutine track_change_T
 
+use runparam, only: itracebug
 if (itracebug.eq.1)  call tracebug(' Entree dans routine fake track_change_T')
 fake=1
@@ -41 +40 @@
 subroutine  massb_perturb_Tparam
 
+use runparam, only: itracebug
 if (itracebug.eq.1)  call tracebug(' Entree dans routine fake massb_perturb_Tparam  ')
 fake=1
 end subroutine massb_perturb_Tparam
-!____________________________________________________
-subroutine massb_anteis_forcage
 
-if (itracebug.eq.1)  call tracebug(' Entree dans routine fake massb_perturb_Tparam  ')
-fake=1
-end subroutine massb_anteis_forcage
 !____________________________________________________
 subroutine time_step_recul

branches/GRISLIv3/SOURCES/GrIce2sea_files/lect_GrIce2sea_gen_nc.f90

@@ -14 +14 @@
 module lect_topo_green_gen
 
-  use module3D_phy
-  use param_phy_mod
-  use interface_input
-  use io_netcdf_grisli
+  use geography, only: nx,ny
 
   character(len=100) :: topo_surf      !< surface file name
@@ -38 +35 @@
   subroutine input_topo
 
+    use geography, only: dirnameinp
+    use runparam, only: runname
+    use module3D_phy, only: b,bsoc,bsoc0,h,h0,s,s0,mk_init,mk0,flot,ghf,ghf0
+
     namelist/topo_groen_gen/topo_surf,correc_surf,topo_bed,mask_grounded,longitude,latitude,heatflux
 

branches/GRISLIv3/SOURCES/GrIce2sea_files/module_choix_GrIce2sea.f90

@@ -44 +44 @@
 
 !--------------Lecture climat ref ------------------
-!use lect_clim_act_anteis
 
 ! use lect_clim_act_ant_gen
@@ -109 +108 @@
 ! use dragging_calc_beta           ! tourne en "no_spinup" qui contient les fake
 !use dragging_prescr_beta
-use beta_iter_vitbil_mod
+!use beta_iter_vitbil_mod
+use dragging_beta_iter_vitbil_mod
 !use dragging_LGM
 !use dragging_plastic_LGM

branches/GRISLIv3/SOURCES/GrIce2sea_files/output_Grice2sea_mod.f90

@@ -13 +13 @@
 module output_grice2sea_mod
 
-  USE module3D_phy
-  USE param_phy_mod
-  use io_netcdf_grisli
+  use geography, only: nx,ny
 
   implicit none
@@ -73 +71 @@
   
   subroutine init_outshort
-    
+   
+    use runparam, only: runname,dirnameout,itracebug
+    use geography, only: dirnameinp,nx,ny
+    use module3d_phy, only: num_param,ndisp,num_rep_42
+    use io_netcdf_grisli, only: read_ncdf_var
+
     implicit none
     
@@ -155 +158 @@
   subroutine shortoutput
 
+    use runparam, only: itracebug,nt
+    use geography, only: nx,ny,nz,dx,dy
+    use param_phy_mod, only: ro,row
+    use module3D_phy, only: flot,h,b,sealevel_2d,vol,np,hmax,s,bm,acc,t,tbdot,ux,uy   &
+                          ,uzsdot,uzk,hdot,bdot,bmelt,calv,ablbord,hmean,time,num_ritz &
+                          ,tafor,sealevel,dt
+
     implicit none
+
     real ::  smax
-
+    integer :: i,j
 
     if (itracebug.eq.1)  call tracebug('output_grice2sea_mod   subroutine shortoutput')
@@ -271 +282 @@
   subroutine output_regions
     
+    use runparam, only: itracebug
+    use param_phy_mod, only: ro,row
+    use geography, only: dx
+    use module3D_phy, only: time,h,b,flot,hdot,bm,sealevel_2d
+
     implicit none
+
     character(len=100)    :: fmt1,fmt2,fmt3
     character(len=2)      :: string_region
+
+    integer :: i,j
+
     if (itracebug.eq.1)  call tracebug('output_grice2sea_mod   subroutine output_regions')
 

branches/GRISLIv3/SOURCES/Grismip6_files/module_choix-grismip6.f90

@@ -10 +10 @@
 !! @note Used modules
 !! @note   - use lect_topo_anteis    
-!! @note   - use lect_clim_act_anteis
 !! @note   - use climat_perturb_mod
 !! @note   - use no_rsl

branches/GRISLIv3/SOURCES/Hemin15_files/module_choix-hemin15.f90

@@ -40 +40 @@
 !--------------Lecture climat ref ------------------
 ! Le climat de ref si necessaire est maintenant lu par le module de climat directement
-!use lect_clim_act_anteis
 !use lect_clim_act_hemin40 ! pour l'hemisphere nord et l'eurasie
 ! use  climat_heino

branches/GRISLIv3/SOURCES/Hemin40_files/module_choix-hemin40-0.4.f90

@@ -40 +40 @@
 !--------------Lecture climat ref ------------------
 ! Le climat de ref si necessaire est maintenant lu par le module de climat directement
-!use lect_clim_act_anteis
 !use lect_clim_act_hemin40 ! pour l'hemisphere nord et l'eurasie
 ! use  climat_heino

branches/GRISLIv3/SOURCES/Laure16_files/module_choix-laurentide.f90

@@ -42 +42 @@
 !--------------Lecture climat ref ------------------
 ! Le climat de ref si necessaire est maintenant lu par le module de climat directement
-!use lect_clim_act_anteis
 !use lect_clim_act_hemin40 ! pour l'hemisphere nord et l'eurasie
 ! use  climat_heino

branches/GRISLIv3/SOURCES/MISMIP3D_files/fake-routines-mismip3d_mod.f90

@@ -53 +53 @@
 end subroutine massb_perturb_Tparam
 !____________________________________________________
-subroutine massb_anteis_forcage
-
-if (itracebug.eq.1)  call tracebug(' Entree dans routine fake massb_perturb_Tparam  ')
-fake=1
-end subroutine massb_anteis_forcage
 
 end module fake_mismip

branches/GRISLIv3/SOURCES/MISMIP3D_files/module_choix_mismip3d.f90

@@ -44 +44 @@
 
 !--------------Lecture climat ref ------------------
-!use lect_clim_act_anteis
 
 ! use lect_clim_act_ant_gen

branches/GRISLIv3/SOURCES/Makefile.grisli.inc

@@ -154 +154 @@
 Liste_grismip6 = output_anta40_mod-0.4.o \
         dragging_prescr_beta_mod.o \
-        dragging_prescr_beta_nolin_mod.o \
         lect-grismip6_mod.o \
         fake-routines-ant_mod.o \
@@ -164 +163 @@
 Liste_ANT16 = output_anta40_mod-0.4.o \
         dragging_prescr_beta_mod.o \
-        dragging_prescr_beta_nolin_mod.o \
         lect-anteis_mod.o \
         bmelt-ant-regions_mod.o \
@@ -174 +172 @@
         dragging_beta_iter_vitbil_mod.o \
         module_choix-ant16km.o \
-        massb-ant_perturb_Tparam.o \
         track_ant40_mod.o
 

branches/GRISLIv3/SOURCES/bmelt-ismip6-param_mod.f90

@@ -17 +17 @@
 module  bmelt_ismip6_param_mod
 
-  use module3D_phy,only: ro,rofresh,row,cl,S,H,sealevel_2d,flot,bmelt,dirnameinp,num_param,num_rep_42,time,dt
-  use geography, only: nx,ny,dx,dy
+  use param_phy_mod, only: ro,rofresh,row
+  use module3D_phy,only: cl,S,H,sealevel_2d,flot,bmelt,num_param,num_rep_42,time,dt
+  use geography, only: dirnameinp,nx,ny,dx,dy
   ! note: the geom. (nx,ny,dx,dy) come from module_geoplace
   ! note: the densities come from param_phy_mod

branches/GRISLIv3/SOURCES/main3D-0.4-40km.f90

@@ -137 +137 @@
   use geography, only: nx,ny,geoplace
   use deformation_mod_2lois, only:n1poly,n2poly
-  use module_choix, only: forclim,ablation,bmeltshelf,calving,flow_general,flowlaw,init_bilan_eau
+  use bilan_eau_mod, only: init_bilan_eau
+  use module_choix, only: forclim,ablation,bmeltshelf,calving,flow_general,flowlaw
   !  module_choix donne acces a tous les modules
   !  de declaration des packages