Changeset 9753 for utils

Timestamp:

2018-06-06T15:28:47+02:00 (7 years ago)

Author:

jchanut

Message:

Modify arithmetic and median bathymetry average near land so that coastline is more realistic

Location:

utils/tools/NESTING/src

Files:

• agrif_connect_topo.f90 (modified) (2 diffs)
• agrif_create_bathy.f90 (modified) (2 diffs)

utils/tools/NESTING/src/agrif_connect_topo.f90

@@ -791 +791 @@
     INTEGER :: i,j
     INTEGER :: k1
-    INTEGER :: compt
+    INTEGER :: compt, compt_oce
     REAL*8, POINTER, DIMENSION(:) :: gdepw,gdept,e3w,e3t
     !                     
@@ -906 +906 @@
           G0%Bathy_meter(ipt,jpt) = 0.
           compt = 0 
+          compt_oce = 0
           DO jj = j-FLOOR(irafy/2.0),j+FLOOR(irafy/2.0)-diff
              DO ii = i-FLOOR(irafx/2.0),i+FLOOR(irafx/2.0)-diff
                 G0%Bathy_meter(ipt,jpt) = G0%Bathy_meter(ipt,jpt) + G1%Bathy_meter(ii,jj)
+                IF (G1%Bathy_meter(ii,jj)>0.) compt_oce = compt_oce + 1
                 compt = compt + 1
              END DO
           END DO
+!          IF (compt_oce > 0.5*irafx*irafy)    G0%Bathy_meter(ipt,jpt) = G0%Bathy_meter(ipt,jpt) / FLOAT(compt)
           G0%Bathy_meter(ipt,jpt) = G0%Bathy_meter(ipt,jpt) / FLOAT(compt)
           IF(G0%Bathy_meter(ipt,jpt).GT.0.)   G0%Bathy_meter(ipt,jpt) = MAX(G0%Bathy_meter(ipt,jpt),zmin)

utils/tools/NESTING/src/agrif_create_bathy.f90

@@ -335 +335 @@
                  WHERE( vardep(:,:) .GT. 0. )  mask_oce = 1
 
-                 IF( SUM(mask_oce) == 0 ) THEN
+!                 IF( SUM(mask_oce) == 0 ) THEN
+                 IF( SUM(mask_oce) < 0.5*(nxhr*nyhr) ) THEN
                     G1%bathy_meter(ji,jj) = 0.
                  ELSE
@@ -562 +563 @@
             END DO
         END DO
-
-        G1%gdepw_ps(:,:) = (1.-G1%wgt(:,:)) * G1%gdepw_ps(:,:) + gdepw_ps_interp(:,:)*G1%wgt(:,:)
+        IF (.NOT.identical_grids) THEN
+           G1%gdepw_ps(:,:) = (1.-G1%wgt(:,:)) * G1%gdepw_ps(:,:) + gdepw_ps_interp(:,:)*G1%wgt(:,:)
+        ENDIF
 
         G1%bathy_meter = G1%gdepw_ps