Changeset 244 for branches/iLoveclim/SOURCES/Ant15_CISM_files

Timestamp:

01/16/19 16:08:14 (5 years ago)

Author:

aquiquet

Message:

Grisli-iloveclim branch merged to trunk at revision 243

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/Ant15_CISM_files/lect-Ant_CISM_15_dat.f90 (deleted)
• SOURCES/Ant15_CISM_files/lect-Ant_clim_CISM_15_dat.f90 (deleted)
• SOURCES/Ant15_CISM_files/module_choix_antar15CISM.f90 (modified) (2 diffs)
• SOURCES/Ant15_CISM_files/output_anta_mod-0.4.f90 (modified) (1 diff)

branches/iLoveclim/SOURCES/Ant15_CISM_files/module_choix_antar15CISM.f90

@@ -12 +12 @@
 !! @note   - use lect_clim_act_ant_15
 !! @note   - use climat_perturb_mod
-!! @note   - use no_lakes
+!! @note   - use no_rsl
 !! @note   - use isostasie_mod 
 !! @note   - use deformation_mod_2lois   
@@ -56 +56 @@
 !use climat_regions_delta
 
-! pas de lacs proglaciaires
-use no_lakes
+! pas de differences locales de niveau marin
+use no_rsl
 
 !--------------Choix isostasie----------------------

branches/iLoveclim/SOURCES/Ant15_CISM_files/output_anta_mod-0.4.f90

@@ -83 +83 @@
 
 !        calcul de la hauteur au dessus de la flottaison
-         if (sealevel-B(i,j).le.0.) then    ! socle au dessus du niveau des mers
+         if (sealevel_2d(i,j)-B(i,j).le.0.) then    ! socle au dessus du niveau des mers
                volf=volf+h(i,j)
          else
-            volf=volf+h(i,j)-row/ro*(sealevel-b(i,j))
+            volf=volf+h(i,j)-row/ro*(sealevel_2d(i,j)-b(i,j))
          endif