Changeset 52 for branches/iLoveclim/SOURCES/steps_time_loop_avec_iterbeta.f90

Timestamp:

02/23/16 15:30:13 (8 years ago)

Author:

dumas

Message:

Merge branche iLOVECLIM sur rev 51

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/steps_time_loop_avec_iterbeta.f90 (modified) (4 diffs)

branches/iLoveclim/SOURCES/steps_time_loop_avec_iterbeta.f90

@@ -15 +15 @@
 
   use module3d_phy
-
-  use geom_type
-  use temperature_type
-  use ice_flow_type
-  use mask_flgz_type
-  use deformation_type
-  use autre_pr_temp_type
-
   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 interface_icetempmod
   use diagno_mod 
-
 
 
@@ -205 +195 @@
   !  module_choix donne acces a tous les modules
   !  de declaration des packages
-  use interface_icetempmod
+  use icetempmod
   use sorties_ncdf_grisli
   use flottab_mod
@@ -211 +201 @@
   use resolmeca_SIA_L1
 !  use track_debug 
-
-  use geom_type
-  use temperature_type
-  use ice_flow_type
-  use mask_flgz_type
-  use deformation_type
-  use autre_pr_temp_type
-  use step_temp_type
 
 
@@ -309 +291 @@
 
      calc_temp:     if ((nt.gt.2).and.(geoplace(1:5).ne.'mism3')) then
-        ! Hassine ca va etre modifier bien sur apres: l appel sera beaucoup moin long que ca 
-        call Update_geom(Geom_g)               
-        call Update_Temperature(Temperature_g)
-        call Update_Ice_flow(Ice_flow_g)
-        call Update_Mask_flgz(Mask_flgz_g)
-        call Update_Deformation(Deformation_g)
-        call Update_autre_pr_temp(Autre_pr_temp_g)
-        call Update_step_temp(step_temp_g)
-
         if (itracebug.eq.1)  call tracebug('avant appel icetemp')
-
-        call icetemp(geom_g,temperature_g, &
-             Ice_flow_g,Mask_flgz_g,&
-             deformation_g,Autre_pr_temp_g,&
-             step_temp_g,num_tracebug,debug_3D)
-
-        ! update arrays T, Tpmp
-        T= Temperature_g%Temperature 
-        Tpmp= Temperature_g%Temp_melting
-        Tbdot= Autre_pr_temp_g%Tbdot
-        Bmelt= Autre_pr_temp_g%BMELT
-        Ibase=Autre_pr_temp_g%IBASE
-        Phid=Autre_pr_temp_g%Phid
-
-        !      write(6,*) time,'call icetemp'
+        call icetemp
         ! subroutines pour le calcul de la fusion basale
         call bmeltshelf