Changeset 24
- Timestamp:
- 12/08/15 15:22:18 (8 years ago)
- Location:
- trunk/SOURCES
- Files:
-
- 6 added
- 6 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/SOURCES/Makefile.grisli.inc
r22 r24 64 64 massb_perturb_mois.o massb_perturb_mois_lapsecouche.o 65 65 66 mod_communs = util_recovery.o \ 67 geom_type.o temperature_type.o ice_flow_type.o mask_flgz_type.o \ 68 interface_input.o deformation_type.o autre_pr_temp_type.o \ 66 mod_communs = util_recovery.o \ 67 interface_input.o \ 69 68 iso_declar_mod-0.3.o isostasie_mod-0.3.o noisostasie_mod-0.3.o \ 70 71 69 deformation_mod_2lois.o deformation_mod_2lois_isotherme.o \ 70 sliding_Bindshadler_mod.o no_sliding.o \ 72 71 dragging_hwatermax_0.2_mod.o dragging_calc_beta_mod.o \ 73 72 dragging_hwat-contigu_mod.o dragging_hwat_contmaj_mod.o \ … … 82 81 tridiag_mod-0.3.o out_horiz_mod.o bmelt-seuil-profondeur_mod.o 83 82 83 # geom_type.o temperature_type.o ice_flow_type.o mask_flgz_type.o \ 84 #deformation_type.o autre_pr_temp_type.o \ 85 84 86 mod_communs_RGL = util_recovery.o \ 85 geom_type.o temperature_type.o ice_flow_type.o mask_flgz_type.o \ 86 interface_input.o deformation_type.o autre_pr_temp_type.o \ 87 interface_input.o \ 87 88 iso_declar_mod-0.3.o isostasie_mod-0.3.o noisostasie_mod-0.3.o \ 88 89 deformation_mod_2lois.o deformation_mod_2lois_isotherme.o \ … … 100 101 tridiag_mod-0.3.o out_horiz_mod.o bmelt-seuil-profondeur_mod.o 101 102 102 103 104 # Modules communs Post geographiques 105 106 mod_post_geo = step_temp_type.o 103 # geom_type.o temperature_type.o ice_flow_type.o mask_flgz_type.o deformation_type.o autre_pr_temp_type.o \ 107 104 108 105 … … 133 130 # enleve : flow_general-0.3.o flowlaw-0.3.o Cat 23 mars 2012 134 131 135 routines_communes = tracebug.o ablation_bord.o allocate_types.o\136 icetemp_declar -0.5_mod.o bmelt-grounded.o calceps2-0.2.o \132 routines_communes = tracebug.o ablation_bord.o \ 133 icetemp_declar_mod.o bmelt-grounded.o calceps2-0.2.o \ 137 134 diffusiv-polyn-0.6.o \ 138 135 flottab-rescue-1.o flottab2-0.7.o \ 139 interface_advec_icetemp.o \140 interface_prop_th_icetemp.o \141 interface_Qprod_icetemp.o \142 interface_temp_col.o \143 i nterface_icetempmod.o \136 advec_icetemp.o \ 137 prop_th_icetemp.o \ 138 Qprod_icetemp.o \ 139 temp_col.o \ 140 icetemp_mod.o \ 144 141 initial-0.3.o initial-phy-2.o initial2-0.4.o \ 145 142 lastoutput-0.2.o lect-eis.o readinput.o lect_datfile.o write_datfile.o \ … … 151 148 tab-litho-0.3.o taubed-0.3.o \ 152 149 velocities-polyn-0.3.o \ 153 vtoutput-0.2.o courbures.o 150 vtoutput-0.2.o courbures.o 151 152 # allocate_types.o \ 154 153 # vtoutput-0.2.o steps_time_loop.o courbures.o 155 154 … … 471 470 $(FT) 3D-physique-gen_mod.f90 472 471 473 # types Hassine474 472 param_phy_mod.o: param_phy_mod.f90 475 473 $(FT) param_phy_mod.f90 476 477 geom_type.o: Types/geom_type.f90478 $(FT) Types/geom_type.f90479 480 temperature_type.o: Types/temperature_type.f90481 $(FT) Types/temperature_type.f90482 483 ice_flow_type.o: Types/ice_flow_type.f90484 $(FT) Types/ice_flow_type.f90485 486 mask_flgz_type.o: Types/mask_flgz_type.f90487 $(FT) Types/mask_flgz_type.f90488 489 deformation_type.o: Types/deformation_type.f90490 $(FT) Types/deformation_type.f90491 492 autre_pr_temp_type.o: Types/autre_pr_temp_type.f90493 $(FT) Types/autre_pr_temp_type.f90494 495 step_temp_type.o: Types/step_temp_type.f90496 $(FT) Types/step_temp_type.f90497 498 allocate_types.o: Types/allocate_types.f90499 $(FT) Types/allocate_types.f90500 501 # fin types Hassine502 474 503 475 lect-anteis_mod.o : Ant40_files/lect-anteis_mod.f90 … … 1320 1292 1321 1293 1322 # Routines Temperature Hassine1323 1324 icetemp_declar -0.5_mod.o : Temperature-routines/icetemp_declar-0.5_mod.f901325 $(FT) Temperature-routines/icetemp_declar -0.5_mod.f901326 1327 interface_advec_icetemp.o : Temperature-routines/interface_advec_icetemp.f901328 $(FT) Temperature-routines/ interface_advec_icetemp.f901329 1330 i nterface_icetempmod.o : Temperature-routines/interface_icetempmod.f901331 $(FT) Temperature-routines/i nterface_icetempmod.f901332 1333 interface_prop_th_icetemp.o: Temperature-routines/interface_prop_th_icetemp.f901334 $(FT) Temperature-routines/ interface_prop_th_icetemp.f901335 1336 interface_Qprod_icetemp.o: Temperature-routines/interface_Qprod_icetemp.f901337 $(FT) Temperature-routines/ interface_Qprod_icetemp.f901338 1339 interface_temp_col.o : Temperature-routines/interface_temp_col.f901340 $(FT) Temperature-routines/ interface_temp_col.f901294 # Routines Temperature 1295 1296 icetemp_declar_mod.o : Temperature-routines/icetemp_declar_mod.f90 1297 $(FT) Temperature-routines/icetemp_declar_mod.f90 1298 1299 advec_icetemp.o : Temperature-routines/advec_icetemp.f90 1300 $(FT) Temperature-routines/advec_icetemp.f90 1301 1302 icetemp_mod.o : Temperature-routines/icetemp_mod.f90 1303 $(FT) Temperature-routines/icetemp_mod.f90 1304 1305 prop_th_icetemp.o: Temperature-routines/prop_th_icetemp.f90 1306 $(FT) Temperature-routines/prop_th_icetemp.f90 1307 1308 Qprod_icetemp.o: Temperature-routines/Qprod_icetemp.f90 1309 $(FT) Temperature-routines/Qprod_icetemp.f90 1310 1311 temp_col.o : Temperature-routines/temp_col.f90 1312 $(FT) Temperature-routines/temp_col.f90 1341 1313 1342 1314 # Routines Agrif … … 1556 1528 $(mod_tracers) \ 1557 1529 $(mod_ell) $(Liste_ANT15-LBq) \ 1558 $(mod_post_geo) \1559 1530 $(diagnoshelf) \ 1560 1531 $(Liste_Netcdf) \ … … 1568 1539 $(mod_ell) \ 1569 1540 $(Liste_ANT15-LBq) \ 1570 $(mod_post_geo) \1571 1541 $(diagnoshelf) $(Liste_Netcdf) \ 1572 1542 $(routines_communes) steps_time_loop.o $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) … … 1578 1548 $(mod_tracers) \ 1579 1549 $(mod_ell) $(Liste_ANT15-LBq) \ 1580 $(mod_post_geo) \1581 1550 $(diagnoshelf) \ 1582 1551 $(Liste_Netcdf) \ … … 1590 1559 $(mod_ell) \ 1591 1560 $(Liste_ANT15-LBq) \ 1592 $(mod_post_geo) \1593 1561 $(diagnoshelf) $(Liste_Netcdf) \ 1594 1562 $(routines_communes) steps_time_loop.o $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) … … 1613 1581 $(mod_tracers) \ 1614 1582 $(mod_ell) $(Liste_GrIce2sea) \ 1615 $(mod_post_geo) \1616 1583 $(diagnoshelf) \ 1617 1584 $(Liste_Netcdf) \ … … 1625 1592 $(mod_tracers) \ 1626 1593 $(mod_ell) $(Liste_GrIce2sea) \ 1627 $(mod_post_geo) \1628 1594 $(diagnoshelf) \ 1629 1595 $(Liste_Netcdf) \ … … 1637 1603 $(mod_tracers) \ 1638 1604 $(mod_ell) $(Liste_GrIce2sea) \ 1639 $(mod_post_geo) \1640 1605 $(diagnoshelf) \ 1641 1606 $(Liste_Netcdf) \ … … 1650 1615 $(mod_tracers) \ 1651 1616 $(mod_ell) $(Liste_GrIce2sea) \ 1652 $(mod_post_geo) \1653 1617 $(diagnoshelf) \ 1654 1618 $(Liste_Netcdf) \ … … 1662 1626 $(mod_no_tracers) \ 1663 1627 $(mod_ell) $(Liste_hemin40) \ 1664 $(mod_post_geo) \1665 1628 $(diagnoshelf) \ 1666 1629 $(Liste_Netcdf) \ … … 1676 1639 $(mod_no_tracers) \ 1677 1640 $(mod_ell) $(Liste_hemin40) \ 1678 $(mod_post_geo) \1679 1641 $(diagnoshelf) \ 1680 1642 $(Liste_Netcdf) \ … … 1688 1650 $(mod_no_tracers) \ 1689 1651 $(mod_ell) $(Liste_hemin15) \ 1690 $(mod_post_geo) \1691 1652 $(diagnoshelf) \ 1692 1653 $(Liste_Netcdf) \ … … 1701 1662 $(mod_no_tracers) \ 1702 1663 $(mod_ell) $(Liste_hemin15) \ 1703 $(mod_post_geo) \1704 1664 $(diagnoshelf) \ 1705 1665 $(Liste_Netcdf) \ … … 1713 1673 $(mod_no_tracers) \ 1714 1674 $(mod_ell) $(Liste_greeneem15) \ 1715 $(mod_post_geo) \1716 1675 $(diagnoshelf) \ 1717 1676 $(Liste_Netcdf) \ … … 1726 1685 $(mod_no_tracers) \ 1727 1686 $(mod_ell) $(Liste_greeneem15) \ 1728 $(mod_post_geo) \1729 1687 $(diagnoshelf) \ 1730 1688 $(Liste_Netcdf) \ -
trunk/SOURCES/initial-0.3.f90
r11 r24 12 12 !! @note - use module3D_phy 13 13 !! @note - use module_choix 14 !! @note - use interface_icetempmod 15 !! @note - use interface_prop_th_icetemp 14 !! @note - use icetempmod 16 15 !! @note - use diagno_mod 17 16 !! @note - use resolmeca_SIA_L1 … … 25 24 use module3D_phy 26 25 use module_choix 27 use interface_icetempmod 28 use interface_prop_th_icetemp 26 use icetempmod 29 27 use diagno_mod 30 28 use resolmeca_SIA_L1 … … 88 86 if (geoplace(1:5).ne.'mism3') then 89 87 call init_icetemp(Num_rep_42) ! initialise le calcul de temperature 90 call thermal_prop_icetemp (T,TPMP,H,debug_3D)! appel aux proprietes thermiques88 call thermal_prop_icetemp ! appel aux proprietes thermiques 91 89 call init_bmelt ! Appel aux tableaux d'initialisation des ice shelves 92 90 … … 137 135 call init_calving 138 136 139 call allocate_types ! cette routine alloue tous les types derive140 137 ! 141 138 !------------------------------------------------------------------------------------- -
trunk/SOURCES/main3D-0.4-40km.f90
r19 r24 55 55 !! @note use module_choix 56 56 !! @note use flottab_mod 57 !! @note use i nterface_icetempmod57 !! @note use icetempmod 58 58 !! @note use sorties_ncdf_grisli 59 59 !! @note use diagno_mod … … 85 85 !! @note use module_choix 86 86 !! @note use flottab_mod 87 !! @note use i nterface_icetempmod87 !! @note use icetempmod 88 88 !! @note use sorties_ncdf_grisli 89 89 !! @note use diagno_mod … … 107 107 ! de declaration des packages 108 108 use flottab_mod 109 use i nterface_icetempmod109 use icetempmod 110 110 use sorties_ncdf_grisli 111 111 use diagno_mod … … 147 147 ! de declaration des packages 148 148 use flottab_mod 149 use i nterface_icetempmod149 use icetempmod 150 150 use sorties_ncdf_grisli 151 151 use util_recovery -
trunk/SOURCES/steps_time_loop.f90
r19 r24 16 16 use module3d_phy 17 17 18 use geom_type19 use temperature_type20 use ice_flow_type21 use mask_flgz_type22 use deformation_type23 use autre_pr_temp_type24 25 18 use module_choix ! module de choix du type de run 26 19 ! module_choix donne acces a tous les modules … … 29 22 use sorties_ncdf_grisli 30 23 use flottab_mod 31 use i nterface_icetempmod24 use icetempmod 32 25 use diagno_mod 33 26 ! use track_debug … … 199 192 ! module_choix donne acces a tous les modules 200 193 ! de declaration des packages 201 use i nterface_icetempmod194 use icetempmod 202 195 use sorties_ncdf_grisli 203 196 use flottab_mod … … 205 198 use resolmeca_SIA_L1 206 199 ! use track_debug 207 208 use geom_type209 use temperature_type210 use ice_flow_type211 use mask_flgz_type212 use deformation_type213 use autre_pr_temp_type214 use step_temp_type215 200 216 201 … … 303 288 304 289 calc_temp: if ((nt.gt.2).and.(geoplace(1:5).ne.'mism3')) then 305 ! Hassine ca va etre modifier bien sur apres: l appel sera beaucoup moin long que ca306 call Update_geom(Geom_g)307 call Update_Temperature(Temperature_g)308 call Update_Ice_flow(Ice_flow_g)309 call Update_Mask_flgz(Mask_flgz_g)310 call Update_Deformation(Deformation_g)311 call Update_autre_pr_temp(Autre_pr_temp_g)312 call Update_step_temp(step_temp_g)313 314 290 if (itracebug.eq.1) call tracebug('avant appel icetemp') 315 316 call icetemp(geom_g,temperature_g, & 317 Ice_flow_g,Mask_flgz_g,& 318 deformation_g,Autre_pr_temp_g,& 319 step_temp_g,num_tracebug,debug_3D) 320 321 ! update arrays T, Tpmp 322 T= Temperature_g%Temperature 323 Tpmp= Temperature_g%Temp_melting 324 Tbdot= Autre_pr_temp_g%Tbdot 325 Bmelt= Autre_pr_temp_g%BMELT 326 Ibase=Autre_pr_temp_g%IBASE 327 Phid=Autre_pr_temp_g%Phid 328 329 ! write(6,*) time,'call icetemp' 291 call icetemp 330 292 ! subroutines pour le calcul de la fusion basale 331 293 call bmeltshelf
Note: See TracChangeset
for help on using the changeset viewer.