Changeset 237 for trunk/SOURCES/GrIce2sea_files

Timestamp:

01/09/19 17:09:26 (5 years ago)

Author:

aquiquet

Message:

Sealevel is now treated as a 2D variable (sealevel_2d while sealevel remains the eustatic sea level), results should remain identical as sealevel_2d is equal to sealevel in this revision.

Location:

trunk/SOURCES/GrIce2sea_files

Files:

• climat_GrIce2sea_years_perturb_mod.f90 (modified) (2 diffs)
• lect_GrIce2sea_gen_nc.f90 (modified) (1 diff)
• output_Grice2sea_mod.f90 (modified) (2 diffs)

trunk/SOURCES/GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90

@@ -16 +16 @@
 
 
-use module3d_phy,only: nx,ny,S,S0,H,Bsoc,acc,abl,BM,Tann,Tjuly,Ts,time,dt,num_param,num_rep_42,num_forc,dirforcage,dirnameinp,tafor,time,sealevel,coefbmshelf
+use module3d_phy,only: nx,ny,S,S0,H,Bsoc,acc,abl,BM,Tann,Tjuly,Ts,time,dt,num_param,num_rep_42,num_forc,dirforcage,dirnameinp,tafor,time,sealevel,sealevel_2d,coefbmshelf
 !use lect_climref_Ice2sea
 use netcdf
@@ -382 +382 @@
         endif
 100     continue
+
+        sealevel_2d(:,:) = sealevel
 
         Tann (:,:) = Ta0 (:,:) + T_lapse_rate * (S(:,:)-S0(:,:)) +Tafor

trunk/SOURCES/GrIce2sea_files/lect_GrIce2sea_gen_nc.f90

@@ -207 +207 @@
 
 
-    !     lecture du fichier de reference pour le calcul du niveau des mers : etat actuel
-    !     pas de version correcte pour l'instant -> valeurs initiales
-    S_sealev(:,:) = S0(:,:)
-    H_sealev(:,:) = H0(:,:)
-    B_sealev(:,:) = Bsoc(:,:)
-    M_sealev(:,:) = Mk0(:,:)
-
     if (itracebug.eq.1)  call tracebug(' apres lect entete')
   

trunk/SOURCES/GrIce2sea_files/output_Grice2sea_mod.f90

@@ -196 +196 @@
              
              !        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
              
@@ -298 +298 @@
                 scal_np         =  scal_np + 1
                 scal_vol        =  scal_vol + H(i,j)
-                scal_volbuoy    =  scal_volbuoy + H(i,j) - row/ro * max(0.,sealevel-b(i,j))
+                scal_volbuoy    =  scal_volbuoy + H(i,j) - row/ro * max(0.,sealevel_2d(i,j)-b(i,j))
                 scal_meanhdot   =  scal_meanhdot + Hdot(i,j)
                 scal_sigma_hdot =  scal_sigma_hdot + Hdot(i,j)**2