Changeset 10025 for utils/tools/NESTING/src/agrif_partial_steps.f90

Timestamp:

2018-08-02T15:25:27+02:00 (6 years ago)

Author:

clem

Message:

nesting tools are partly rewritten (mostly for create_coordinates and bathy) to get better functionality. Now you can use the nesting to either define an agrif zoom or a regional domain (for bdy purposes). Also, the nesting tools output a domain_cfg.nc that can be directly used in NEMO4 without the need of DOMAINcfg tool. The option of median average for bathymetry interpolation still does not work properly but it's not new

File:

• utils/tools/NESTING/src/agrif_partial_steps.f90 (modified) (8 diffs)

utils/tools/NESTING/src/agrif_partial_steps.f90

@@ -276 +276 @@
     REAL,DIMENSION(N) :: gdepw,e3t
     REAL :: za0,za1,za2,zsur,zacr,zacr2,zkth,zkth2,zmin,zmax,zdepth
-    INTEGER :: kbathy,jk,diff
-    INTEGER :: bornex,borney,bornex2,borney2
+    INTEGER :: kbathy,jk
     !
     IF ( ( pa0 == 0 .OR. pa1 == 0 .OR. psur == 0 ) &
@@ -348 +347 @@
        e3t(N) = e3t(N-1)
     END IF
-    !
-    diff = 0      
-    IF ( MOD(irafx,2) .EQ. 0 ) diff = 1
-    !       
-    bornex = nbghostcellsfine + 1 + CEILING(irafx/2.0) + diff - irafx
-    borney = nbghostcellsfine + 1 + CEILING(irafy/2.0) + diff - irafy
-    bornex2 = nxfin - nbghostcellsfine - irafx - CEILING(irafx/2.0) 
-    borney2 = nyfin - nbghostcellsfine - irafy - CEILING(irafy/2.0)                      
-    !
+    !              
     !
     ! west boundary
-    !
-
-    CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,2+nbghostcellsfine+(npt_copy+npt_connect)*irafx-1, &
-         1,nyfin)
-
+    IF( ln_agrif_domain ) THEN
+       CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,2+nbghostcellsfine+(npt_copy+npt_connect)*irafx-1,1,nyfin)
+    ELSE
+       CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,(npt_copy+npt_connect)*irafx,1,nyfin)
+    ENDIF
     !
     ! east boundary
-    !
-
-    CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,nxfin-1-nbghostcellsfine-((npt_copy+npt_connect)*irafx-1),nxfin, &
-         1,nyfin)
-
+    IF( ln_agrif_domain ) THEN
+       CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,nxfin-1-nbghostcellsfine-((npt_copy+npt_connect)*irafx-1),nxfin,1,nyfin)
+    ELSE
+       CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,nxfin-((npt_copy+npt_connect)*irafx+1),nxfin,1,nyfin)
+    ENDIF
     !
     ! north boundary
-    !
-
-    CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,nxfin, &
-         nyfin-1 - nbghostcellsfine -((npt_copy+npt_connect)*irafy-1),nyfin )
-
+    IF( ln_agrif_domain ) THEN
+       CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,nxfin,nyfin-1-nbghostcellsfine-((npt_copy+npt_connect)*irafy-1),nyfin)
+    ELSE
+       CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,nxfin,nyfin-((npt_copy+npt_connect)*irafy+1),nyfin)
+    ENDIF
     !
     ! south boundary
-    !
-    CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,nxfin, &
-         1,2+nbghostcellsfine+(npt_copy+npt_connect)*irafy-1 )
-
+    IF( ln_agrif_domain ) THEN
+       CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,nxfin,1,2+nbghostcellsfine+(npt_copy+npt_connect)*irafy-1)
+    ELSE
+       CALL correct_level( gdepwchild,ParentGrid,gdepw,e3t,1,nxfin,1,(npt_copy+npt_connect)*irafy)
+    ENDIF
     !       
     !
@@ -398 +390 @@
     INTEGER :: kbathy,jk,indx,indy,diff
     REAL :: xdiff
-    INTEGER :: i,j,ji,ij,ii,jj,jpt,ipt
+    INTEGER :: i,j,ji,ij,ii,jj,jpt,ipt,i1,i2,j1,j2,ii1,ii2,jj1,jj2
     REAL*8 :: slopex, slopey,val,tmp1,tmp2,tmp3,tmp4
     INTEGER :: parentbathy
@@ -471 +463 @@
     jend = pty + agrif_int((y-ymin-dyfin/2.)/dyfin)               
 
-
-    ALLOCATE(gdepwtemp(ibegin-irafx:iend+irafx,jbegin-irafy:jend+irafy))
-    ALLOCATE(parentbathytab(ibegin-irafx:iend+irafx,jbegin-irafy:jend+irafy))
-
+    IF( ln_agrif_domain ) THEN
+       ALLOCATE(gdepwtemp(ibegin-irafx:iend+irafx,jbegin-irafy:jend+irafy))
+       ALLOCATE(parentbathytab(ibegin-irafx:iend+irafx,jbegin-irafy:jend+irafy))
+
+       i1 = ibegin
+       i2 = iend
+       j1 = jbegin
+       j2 = jend
+       
+       ii1 = -FLOOR(irafx/2.0)+diff
+       ii2 =  FLOOR(irafx/2.0)
+       jj1 = -FLOOR(irafy/2.0)+diff
+       jj2 =  FLOOR(irafy/2.0)
+    ELSE
+       ibegin = minboundx
+       jbegin = minboundy
+       iend   = maxboundx ! (npt_copy+npt_connect)*irafx
+       jend   = maxboundy ! (npt_copy+npt_connect)*irafy
+       !
+       ipbegin = imin + (ibegin-1)/irafx
+       jpbegin = jmin + (jbegin-1)/irafy
+       ipend   = ipbegin + (npt_copy+npt_connect) - 1
+       jpend   = jpbegin + (npt_copy+npt_connect) - 1
+       !
+       i1 = ibegin
+       i2 = iend
+       j1 = jbegin
+       j2 = jend
+       
+       ii1 = 0
+       ii2 = irafx - 1
+       jj1 = 0
+       jj2 = irafy - 1
+       !
+       ALLOCATE(gdepwtemp(ibegin:iend,jbegin:jend))
+       ALLOCATE(parentbathytab(ibegin:iend,jbegin:jend))
+
+    ENDIF
+    
 
     jpt=jpbegin
@@ -482 +509 @@
 
 
-       DO i=ibegin,iend,irafx
+       DO i=i1,i2,irafx
 
 
@@ -524 +551 @@
           ! interpolation on fine grid points (connection zone)
           !
-          DO ii = i-FLOOR(irafx/2.0)+diff,i+FLOOR(irafx/2.0)
-             x = ii-i - xdiff/2.
+          DO ii = i+ii1,i+ii2
+!!             x = ii-i - xdiff/2.
 !!             val = parentgrid%gdepw_ps(ipt,jpt)+slopex * x
 !! chanut: uncomment this to get nearest neighbor interpolation
@@ -563 +590 @@
 
           slopey = vanleer(gdepwtemp(i,j-irafy:j+irafy:irafy))/REAL(irafy)
-
+          
           tmp1 = (maxdepth - gdepwtemp(i,j)) / REAL(irafy)
           tmp2 = (gdepwtemp(i,j) - mindepth) / REAL(irafy)
@@ -583 +610 @@
 
 
-          DO jj = j-FLOOR(irafy/2.0)+diff,j+FLOOR(irafy/2.0)
-             y = jj-j - xdiff/2.
+          DO jj = j+jj1,j+jj2
+!!             y = jj-j - xdiff/2.
 !!             val = gdepwtemp(i,j) + slopey*y
 !! chanut: uncomment this to get nearest neighbor interpolation