Changeset 433

Timestamp:

04/26/23 18:23:45 (12 months ago)

Author:

dumas

Message:

Use only in step_time_loop : module_choix is used only when it is required

File:

• branches/GRISLIv3/SOURCES/steps_time_loop.f90 (modified) (8 diffs)

branches/GRISLIv3/SOURCES/steps_time_loop.f90

@@ -14 +14 @@
 subroutine step_time_loop        
 
-  use module3d_phy
-  use module_choix ! module de choix du type de run
-                   !  module_choix donne acces a tous les modules
-                   !  de declaration des packages
-  use sorties_ncdf_grisli
-  use flottab_mod
-  use icetempmod
-  use diagno_mod
-  use bilan_eau_mod
-  use bilan_flux_mod
-  !  use track_debug 
+  use module3d_phy, only: ispinup,isynchro,timemax,time,flot,S,B,Bsoc,H,sealevel_2d,hmx,hmy,&
+       uxbar,uybar,hdot,dtmax,dtmin,iout
+  use runparam, only: itracebug,nt,num_tracebug
+  use equat_adv_diff_2D_vect, only: icethick3
+  use calving_frange, only: calving
+  use flottab_mod, only: flottab,determin_tache,determin_marais
+  use sorties_ncdf_grisli, only: iglob_ncdf,testsort_time_ncdf,sortie_ncdf_cat
+  use resolmeca_SIA_L1, only: mix_SIA_L1
+  use bilan_eau_mod, only: diff_H,Bm_dtt,bmelt_dtt,calv_dtt,ablbord_dtt,diff_H_2D,grline_dtt,&
+       bilan_eau
+  use bilan_flux_mod, only: bilan_flux_output
+  !  module_choix donne acces aux modules interchangeables
+  use module_choix, only: shortoutput
 
   implicit none
@@ -119 +121 @@
   call testsort_time_ncdf(time)
   if (iglob_ncdf .EQ. 1) call sortie_ncdf_cat
-!  if ((isynchro.eq.1).or.(nt.eq.1).and.(mod(abs(TIME),1.).lt.dtmin)) then
+  !  if ((isynchro.eq.1).or.(nt.eq.1).and.(mod(abs(TIME),1.).lt.dtmin)) then
   if ((nt.eq.1).or.((isynchro.eq.1).and.(mod(abs(TIME),1.).lt.dtmin))) then
-    call shortoutput
-    diff_H = 0.
-    Bm_dtt(:,:) = 0.
-    bmelt_dtt(:,:) = 0.
-    calv_dtt(:,:)=0.
-    ablbord_dtt(:,:)=0.
-    diff_H_2D(:,:)=0.
-    grline_dtt(:,:)=0.
+     call shortoutput
+     diff_H = 0.
+     Bm_dtt(:,:) = 0.
+     bmelt_dtt(:,:) = 0.
+     calv_dtt(:,:)=0.
+     ablbord_dtt(:,:)=0.
+     diff_H_2D(:,:)=0.
+     grline_dtt(:,:)=0.
   endif
 
@@ -138 +140 @@
 
   call out_recovery(iout)
-  
+
   ! end of outputs
 
@@ -162 +164 @@
 ! - ice temperature
 
-subroutine step_thermomeca()
-
-
-  use module3d_phy
-  use module_choix ! module de choix du type de run
-  !  module_choix donne acces a tous les modules
-  !  de declaration des packages
-  use icetempmod
-  use sorties_ncdf_grisli
-  use flottab_mod
-  use diagno_mod
-  use resolmeca_SIA_L1
-  use iso_declar, only: dt_iso
-!  use track_debug 
-
+subroutine step_thermomeca
+  
+  use module3d_phy, only: ispinup,isynchro,timemax,time,marine,iglen,shelfy,icompteur,&
+       test_iter_diag,inv_beta,dtmin
+  use runparam, only: itracebug,nt,num_tracebug
+  use geography, only: geoplace
+  use deformation_mod_2lois, only: n1poly,n2poly
+  use iso_declar, only: nbed,dt_iso
+  use sorties_ncdf_grisli, only:
+  use resolmeca_SIA_L1, only: mix_SIA_L1
+  use diagno_mod, only: diagnoshelf
+  use beta_iter_vitbil_mod, only: beta_iter_vitbil
+  use icetempmod, only: icetemp
+  use deformation_mod_2lois, only: flow_general,flowlaw
+  !  module_choix donne acces aux modules interchangeables
+  use module_choix, only: time_iter,time_iter_end,nb_iter_vitbil,bedrock,forclim,ablation,&
+       rsl,bmeltshelf,tracer,calc_coef_vitbil,force_balance_vel
 
   implicit none
@@ -197 +201 @@
   !--------------------------------------------------------------------
 
-!  call limit_file(nt,real(time),dt,tend,dtsortie,dtcpt,testdiag,dtt,runname)
+  !  call limit_file(nt,real(time),dt,tend,dtsortie,dtcpt,testdiag,dtt,runname)
 
   !if (time.lt.tgrounded) then
@@ -207 +211 @@
   ! update the regions (floating, ice ...)
   !-------------------------------------------
-  call masque()
+  call masque
 
 
@@ -293 +297 @@
         if (itracebug.eq.1)  call tracebug(' Dans spinup_2_flowlaw')
 
-           call flow_general
-           do iglen=n1poly,n2poly
-              call flowlaw(iglen)
-           end do
+        call flow_general
+        do iglen=n1poly,n2poly
+           call flowlaw(iglen)
+        end do
 
 
@@ -353 +357 @@
 
         else if ((icompteur.ne.1).and.(nt.le.1)) then  ! initialisation avec reprise partielle 
-                                                       ! ou nulle du vecteur d' etat
-          iter_visco = 10
+           ! ou nulle du vecteur d' etat
+           iter_visco = 10
         else
-          iter_visco = 2
+           iter_visco = 2
         end if
- 
-           test_iter_diag=0.
-           do m=1,iter_visco              
+
+        test_iter_diag=0.
+        do m=1,iter_visco              
+           call diagnoshelf
+           call mix_SIA_L1  
+           call strain_rate
+           if (test_iter_diag.lt.1.e-2) exit
+        end do
+
+        ! iterations pour inversion du beta en fonction des vitesses de bilan
+        if ((inv_beta.eq.1).and.(time.ge.time_iter).and.(time.le.time_iter_end)) then  ! iterations pendant 20 ans
+           do m=1,nb_iter_vitbil
+              call beta_iter_vitbil(m)
               call diagnoshelf
-              call mix_SIA_L1  
+              call mix_SIA_L1
               call strain_rate
-              if (test_iter_diag.lt.1.e-2) exit
            end do
-           
-           ! iterations pour inversion du beta en fonction des vitesses de bilan
-           if ((inv_beta.eq.1).and.(time.ge.time_iter).and.(time.le.time_iter_end)) then  ! iterations pendant 20 ans
-              do m=1,nb_iter_vitbil
-                 call beta_iter_vitbil(m)
-                 call diagnoshelf
-                 call mix_SIA_L1
-                 call strain_rate
-              end do
-           end if
-           ! fin des iterations beta_iter_vitbil
-
-        endif isync_2
+        end if
+        ! fin des iterations beta_iter_vitbil
+
+     endif isync_2
 
      call  mix_SIA_L1  
 
   end if spinup_4_vitdyn
- 
-  
+
+
   ! isostasy
   !=================
 
   spinup_3_bed: if ((ISYNCHRO.eq.1).and.(ispinup.eq.0.or.nt.lt.nt_init_tm)) then
-  !---------------------------------------------------------------------------------
-  ! spinup_3_bed
-  !----------------
-  ! Ne passe dans ce bloc que quand on veut l'isostasie, donc si variations epaisseur
-  ! run standard  (ispinup=0) et pour les initialisations                  
-  !---------------------------------------------------------------------------------
-
-  if (itracebug.eq.1)  call tracebug(' Dans spinup_3_bed')
-
-  if ((nbed.eq.1).and.nt.ne.1.and.isynchro.eq.1.and.(mod(abs(TIME),dt_iso).lt.dtmin)) then
-    call bedrock                 !  bedrock adjustment
-  endif
+     !---------------------------------------------------------------------------------
+     ! spinup_3_bed
+     !----------------
+     ! Ne passe dans ce bloc que quand on veut l'isostasie, donc si variations epaisseur
+     ! run standard  (ispinup=0) et pour les initialisations                  
+     !---------------------------------------------------------------------------------
+
+     if (itracebug.eq.1)  call tracebug(' Dans spinup_3_bed')
+
+     if ((nbed.eq.1).and.nt.ne.1.and.isynchro.eq.1.and.(mod(abs(TIME),dt_iso).lt.dtmin)) then
+        call bedrock                 !  bedrock adjustment
+     endif
 
 
   end if spinup_3_bed
-  
+
 
 end subroutine step_thermomeca