- Timestamp:
- 2016-11-18T09:34:22+01:00 (8 years ago)
- Location:
- branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/TOOLS/NESTING/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/TOOLS/NESTING/src/agrif_connect_topo.f90
r2143 r7261 105 105 IMPLICIT NONE 106 106 ! 107 REAL*8 :: za 1,za0,zsur,zacr,zkth,zmin,zmax107 REAL*8 :: za2,za1,za0,zsur,zacr,zkth,zacr2,zkth2,zmin,zmax 108 108 TYPE(Coordinates) :: Grid 109 109 INTEGER :: i,j … … 134 134 za0 = pa0 135 135 za1 = pa1 136 za2 = pa2 136 137 ! 137 138 ELSE … … 147 148 148 149 zacr = ppacr 149 zkth = ppkth 150 150 zkth = ppkth 151 zacr2 = ppacr2 152 zkth2 = ppkth2 151 153 ! 152 154 ALLOCATE(gdepw(N),gdept(N),e3w(N),e3t(N)) 153 155 ! 154 DO i = 1,N 155 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 156 gdept(i) = (zsur+za0*(i+0.5)+za1*zacr*LOG(COSH(((i+0.5)-zkth)/zacr))) 157 e3w(i) = (za0 + za1 * TANH((i-zkth)/zacr)) 158 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 159 END DO 156 IF( ppkth == 0. ) THEN ! uniform vertical grid 157 za1 = pphmax / FLOAT(N-1) 158 DO i = 1, N 159 gdepw(i) = ( i - 1 ) * za1 160 gdept(i) = ( i - 0.5 ) * za1 161 e3w (i) = za1 162 e3t (i) = za1 163 END DO 164 ELSE ! Madec & Imbard 1996 function 165 IF( .NOT. ldbletanh ) THEN 166 DO i = 1,N 167 ! 168 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 169 gdept(i) = (zsur+za0*(i+0.5)+za1*zacr*LOG(COSH(((i+0.5)-zkth)/zacr))) 170 e3w(i) = (za0 + za1 * TANH((i-zkth)/zacr)) 171 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 172 ! 173 END DO 174 ELSE 175 DO i = 1,N 176 ! Double tanh function 177 gdepw(i) = ( zsur + za0*i + za1 * zacr * LOG ( COSH( (i-zkth ) / zacr ) ) & 178 & + za2 * zacr2* LOG ( COSH( (i-zkth2) / zacr2 ) ) ) 179 gdept(i) = ( zsur + za0*(i+0.5) + za1 * zacr * LOG ( COSH( ((i+0.5)-zkth ) / zacr ) ) & 180 & + za2 * zacr2* LOG ( COSH( ((i+0.5)-zkth2) / zacr2 ) ) ) 181 e3w (i) = za0 + za1 * TANH( (i-zkth ) / zacr ) & 182 & + za2 * TANH( (i-zkth2) / zacr2 ) 183 e3t (i) = za0 + za1 * TANH( ((i+0.5)-zkth ) / zacr ) & 184 & + za2 * TANH( ((i+0.5)-zkth2) / zacr2 ) 185 END DO 186 ENDIF 187 ENDIF 160 188 ! 161 189 gdepw(1) = 0.0 162 190 zmax = gdepw(N) + e3t(N) 163 zmin = gdepw(4) 191 IF( rn_hmin < 0. ) THEN ; i = - INT( rn_hmin ) ! from a nb of level 192 ELSE ; i = MINLOC( gdepw, mask = gdepw > rn_hmin, dim = 1 ) ! from a depth 193 ENDIF 194 zmin = gdepw(i+1) 164 195 ! 165 196 IF ( .NOT. ASSOCIATED(Grid%bathy_level)) & … … 227 258 IMPLICIT NONE 228 259 ! 229 REAL*8 :: za 1,za0,zsur,zacr,zkth,zmin,zmax260 REAL*8 :: za2,za1,za0,zsur,zacr,zkth,zacr2,zkth2,zmin,zmax 230 261 TYPE(Coordinates) :: Grid 231 262 INTEGER :: i,j … … 257 288 za0 = pa0 258 289 za1 = pa1 290 za2 = pa2 259 291 ! 260 292 ELSE … … 264 296 WRITE(*,*) 'please check values of variables' 265 297 WRITE(*,*) 'in namelist vertical_grid section' 266 WRITE(*,*) ' ' 267 STOP 298 WRITE(*,*) ' ' 299 STOP 268 300 ! 269 301 ENDIF 270 ! 302 271 303 zacr = ppacr 272 zkth = ppkth 273 304 zkth = ppkth 305 zacr2 = ppacr2 306 zkth2 = ppkth2 274 307 ! 275 308 ALLOCATE(gdepw(N),gdept(N),e3w(N),e3t(N)) 276 309 ! 277 DO i = 1,N 278 ! 279 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 280 gdept(i) = (zsur+za0*(i+0.5)+za1*zacr*LOG(COSH(((i+0.5)-zkth)/zacr))) 281 e3w(i) = (za0 + za1 * TANH((i-zkth)/zacr)) 282 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 283 END DO 310 IF( ppkth == 0. ) THEN ! uniform vertical grid 311 za1 = pphmax / FLOAT(N-1) 312 DO i = 1, N 313 gdepw(i) = ( i - 1 ) * za1 314 gdept(i) = ( i - 0.5 ) * za1 315 e3w (i) = za1 316 e3t (i) = za1 317 END DO 318 ELSE ! Madec & Imbard 1996 function 319 IF( .NOT. ldbletanh ) THEN 320 DO i = 1,N 321 ! 322 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 323 gdept(i) = (zsur+za0*(i+0.5)+za1*zacr*LOG(COSH(((i+0.5)-zkth)/zacr))) 324 e3w(i) = (za0 + za1 * TANH((i-zkth)/zacr)) 325 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 326 ! 327 END DO 328 ELSE 329 DO i = 1,N 330 ! Double tanh function 331 gdepw(i) = ( zsur + za0*i + za1 * zacr * LOG ( COSH( (i-zkth ) / zacr ) ) & 332 & + za2 * zacr2* LOG ( COSH( (i-zkth2) / zacr2 ) ) ) 333 gdept(i) = ( zsur + za0*(i+0.5) + za1 * zacr * LOG ( COSH( ((i+0.5)-zkth ) / zacr ) ) & 334 & + za2 * zacr2* LOG ( COSH( ((i+0.5)-zkth2) / zacr2 ) ) ) 335 e3w (i) = za0 + za1 * TANH( (i-zkth ) / zacr ) & 336 & + za2 * TANH( (i-zkth2) / zacr2 ) 337 e3t (i) = za0 + za1 * TANH( ((i+0.5)-zkth ) / zacr ) & 338 & + za2 * TANH( ((i+0.5)-zkth2) / zacr2 ) 339 END DO 340 ENDIF 341 ENDIF 284 342 ! 285 343 gdepw(1) = 0.0 … … 684 742 ! for consistency with fine grid bathymetry * 685 743 ! * 686 ! if a given coarse grid point is masked and one of the 687 ! child grid points contained in this coarse cell is not masked 688 ! the corresponding coarse grid point is unmasked with gdepw(4)*689 ! value 744 ! if a given coarse grid point is masked and one of the * 745 ! child grid points contained in this coarse cell is not masked * 746 ! the corresponding coarse grid point is unmasked with rn_hmin * 747 ! value * 690 748 ! * 691 749 ! - input : * … … 704 762 ! 705 763 INTEGER :: ideb,jdeb,ifin,jfin 706 REAL*8 :: za 1,za0,zsur,zacr,zkth,zmin764 REAL*8 :: za2,za1,za0,zsur,zacr,zkth,zacr2,zkth2,zmin 707 765 INTEGER :: i,j 708 766 INTEGER :: k1 … … 727 785 za0 = pa0 728 786 za1 = pa1 787 za2 = pa2 729 788 ! 730 789 ELSE … … 740 799 741 800 zacr = ppacr 742 zkth = ppkth 743 801 zkth = ppkth 802 zacr2 = ppacr2 803 zkth2 = ppkth2 744 804 ! 745 805 ALLOCATE(gdepw(N),gdept(N),e3w(N),e3t(N)) 746 806 ! 747 DO i = 1,N 748 ! 749 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 750 gdept(i) = (zsur+za0*(i+0.5)+za1*zacr*LOG(COSH(((i+0.5)-zkth)/zacr))) 751 e3w(i) = (za0 + za1 * TANH((i-zkth)/zacr)) 752 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 753 END DO 754 ! 755 zmin = gdepw(4) 807 IF( ppkth == 0. ) THEN ! uniform vertical grid 808 za1 = pphmax / FLOAT(N-1) 809 DO i = 1, N 810 gdepw(i) = ( i - 1 ) * za1 811 gdept(i) = ( i - 0.5 ) * za1 812 e3w (i) = za1 813 e3t (i) = za1 814 END DO 815 ELSE ! Madec & Imbard 1996 function 816 IF( .NOT. ldbletanh ) THEN 817 DO i = 1,N 818 ! 819 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 820 gdept(i) = (zsur+za0*(i+0.5)+za1*zacr*LOG(COSH(((i+0.5)-zkth)/zacr))) 821 e3w(i) = (za0 + za1 * TANH((i-zkth)/zacr)) 822 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 823 ! 824 END DO 825 ELSE 826 DO i = 1,N 827 ! Double tanh function 828 gdepw(i) = ( zsur + za0*i + za1 * zacr * LOG ( COSH( (i-zkth ) / zacr ) ) & 829 & + za2 * zacr2* LOG ( COSH( (i-zkth2) / zacr2 ) ) ) 830 gdept(i) = ( zsur + za0*(i+0.5) + za1 * zacr * LOG ( COSH( ((i+0.5)-zkth ) / zacr ) ) & 831 & + za2 * zacr2* LOG ( COSH( ((i+0.5)-zkth2) / zacr2 ) ) ) 832 e3w (i) = za0 + za1 * TANH( (i-zkth ) / zacr ) & 833 & + za2 * TANH( (i-zkth2) / zacr2 ) 834 e3t (i) = za0 + za1 * TANH( ((i+0.5)-zkth ) / zacr ) & 835 & + za2 * TANH( ((i+0.5)-zkth2) / zacr2 ) 836 END DO 837 ENDIF 838 ENDIF 839 ! 840 IF( rn_hmin < 0. ) THEN ; i = - INT( rn_hmin ) ! from a nb of level 841 ELSE ; i = MINLOC( gdepw, mask = gdepw > rn_hmin, dim = 1 ) ! from a depth 842 ENDIF 843 zmin = gdepw(i+1) 756 844 ! 757 845 diff = 0 -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/TOOLS/NESTING/src/agrif_partial_steps.f90
r2143 r7261 36 36 ! 37 37 TYPE(Coordinates) :: Grid 38 REAL*8 :: za 1,za0,zsur,zacr,zkth,zdepth,zdepwp,zmin,zmax,zdiff,ze3tp,ze3wp38 REAL*8 :: za2,za1,za0,zsur,zacr,zkth,zacr2,zkth2,zdepth,zdepwp,zmin,zmax,zdiff,ze3tp,ze3wp 39 39 INTEGER :: i,j,jk,jj,ji,jpj,jpi,ik,ii,ipt,jpt 40 40 INTEGER, DIMENSION(1) :: k … … 76 76 za0 = pa0 77 77 za1 = pa1 78 za2 = pa2 78 79 ! 79 80 ELSE … … 88 89 ENDIF 89 90 90 zacr = ppacr 91 zkth = ppkth 92 ! 93 DO i = 1,N 94 ! 95 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 96 gdept(i) = (zsur+za0*(i+0.5)+za1*zacr*LOG(COSH(((i+0.5)-zkth)/zacr))) 97 e3w(i) = (za0 + za1 * TANH((i-zkth)/zacr)) 98 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 99 ! 100 END DO 101 ! 102 91 zacr = ppacr 92 zkth = ppkth 93 zacr2 = ppacr2 94 zkth2 = ppkth2 95 ! 96 IF( ppkth == 0. ) THEN ! uniform vertical grid 97 za1 = pphmax / FLOAT(N-1) 98 DO i = 1, N 99 gdepw(i) = ( i - 1 ) * za1 100 gdept(i) = ( i - 0.5 ) * za1 101 e3w (i) = za1 102 e3t (i) = za1 103 END DO 104 ELSE ! Madec & Imbard 1996 function 105 IF( .NOT. ldbletanh ) THEN 106 DO i = 1,N 107 ! 108 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 109 gdept(i) = (zsur+za0*(i+0.5)+za1*zacr*LOG(COSH(((i+0.5)-zkth)/zacr))) 110 e3w(i) = (za0 + za1 * TANH((i-zkth)/zacr)) 111 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 112 ! 113 END DO 114 ELSE 115 DO i = 1,N 116 ! Double tanh function 117 gdepw(i) = ( zsur + za0*i + za1 * zacr * LOG ( COSH( (i-zkth ) / zacr ) ) & 118 & + za2 * zacr2* LOG ( COSH( (i-zkth2) / zacr2 ) ) ) 119 gdept(i) = ( zsur + za0*(i+0.5) + za1 * zacr * LOG ( COSH( ((i+0.5)-zkth ) / zacr ) ) & 120 & + za2 * zacr2* LOG ( COSH( ((i+0.5)-zkth2) / zacr2 ) ) ) 121 e3w (i) = za0 + za1 * TANH( (i-zkth ) / zacr ) & 122 & + za2 * TANH( (i-zkth2) / zacr2 ) 123 e3t (i) = za0 + za1 * TANH( ((i+0.5)-zkth ) / zacr ) & 124 & + za2 * TANH( ((i+0.5)-zkth2) / zacr2 ) 125 END DO 126 ENDIF 127 ENDIF 103 128 gdepw(1) = 0.0 104 129 ! … … 106 131 ! 107 132 zmax = gdepw(N) + e3t(N) 108 zmin = gdepw(4) 133 IF( rn_hmin < 0. ) THEN ; i = - INT( rn_hmin ) ! from a nb of level 134 ELSE ; i = MINLOC( gdepw, mask = gdepw > rn_hmin, dim = 1 ) ! from a depth 135 ENDIF 136 zmin = gdepw(i+1) 109 137 ! 110 138 ! Initialize bathy_level to the maximum ocean level available … … 235 263 INTEGER :: i,j,ji,ij,ii,jj,jpt,ipt 236 264 REAL,DIMENSION(N) :: gdepw,e3t 237 REAL :: za0,za1,z sur,zacr,zkth,zmin,zmax,zdepth265 REAL :: za0,za1,za2,zsur,zacr,zacr2,zkth,zkth2,zmin,zmax,zdepth 238 266 INTEGER :: kbathy,jk,diff 239 267 INTEGER :: bornex,borney,bornex2,borney2 240 ! 268 ! 241 269 IF ( ( pa0 == 0 .OR. pa1 == 0 .OR. psur == 0 ) & 242 270 .AND. ppdzmin.NE.0 .AND. pphmax.NE.0 ) THEN 243 271 ! 272 WRITE(*,*) 'psur,pa0,pa1 computed' 244 273 za1=( ppdzmin - pphmax / (N-1) ) & 245 274 / ( TANH((1-ppkth)/ppacr) - ppacr/(N-1) & … … 253 282 pa0.NE.0 .AND. pa1.NE.0 ) THEN 254 283 ! 284 WRITE(*,*) 'psur,pa0,pa1 given by namelist' 255 285 zsur = psur 256 286 za0 = pa0 257 287 za1 = pa1 288 za2 = pa2 258 289 ! 259 290 ELSE … … 263 294 WRITE(*,*) 'please check values of variables' 264 295 WRITE(*,*) 'in namelist vertical_grid section' 265 WRITE(*,*) ' ' 266 ! 267 ENDIF 268 ! 269 zacr = ppacr 270 zkth = ppkth 271 ! 272 DO i = 1,N 273 ! 274 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 275 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 276 END DO 277 ! 296 WRITE(*,*) ' ' 297 STOP 298 ! 299 ENDIF 300 301 zacr = ppacr 302 zkth = ppkth 303 zacr2 = ppacr2 304 zkth2 = ppkth2 305 ! 306 IF( ppkth == 0. ) THEN ! uniform vertical grid 307 za1 = pphmax / FLOAT(N-1) 308 DO i = 1, N 309 gdepw(i) = ( i - 1 ) * za1 310 e3t (i) = za1 311 END DO 312 ELSE ! Madec & Imbard 1996 function 313 IF( .NOT. ldbletanh ) THEN 314 DO i = 1,N 315 ! 316 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 317 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 318 ! 319 END DO 320 ELSE 321 DO i = 1,N 322 ! Double tanh function 323 gdepw(i) = ( zsur + za0*i + za1 * zacr * LOG ( COSH( (i-zkth ) / zacr ) ) & 324 & + za2 * zacr2* LOG ( COSH( (i-zkth2) / zacr2 ) ) ) 325 e3t (i) = za0 + za1 * TANH( ((i+0.5)-zkth ) / zacr ) & 326 & + za2 * TANH( ((i+0.5)-zkth2) / zacr2 ) 327 END DO 328 ENDIF 329 ENDIF 278 330 gdepw(1) = 0.0 279 !280 331 ! 281 332 diff = 0 … … 344 395 ! 345 396 zmax = gdepw(N) + e3t(N) 346 zmin = gdepw(4) 397 IF( rn_hmin < 0. ) THEN ; i = - INT( rn_hmin ) ! from a nb of level 398 ELSE ; i = MINLOC( gdepw, mask = gdepw > rn_hmin, dim = 1 ) ! from a depth 399 ENDIF 400 zmin = gdepw(i+1) 347 401 ! 348 402 ! check that interpolated value stays at the same level … … 646 700 REAL*8, DIMENSION(:,:,:) :: fse3u,fse3t,fse3v 647 701 ! 648 REAL*8 :: za 1,za0,zsur,zacr,zkth,zdepth,zdepwp,zmin,zmax,zdiff,ze3tp,ze3wp702 REAL*8 :: za2,za1,za0,zsur,zacr,zkth,zacr2,zkth2,zdepth,zdepwp,zmin,zmax,zdiff,ze3tp,ze3wp 649 703 INTEGER :: i,j,jk,jj,ji,jpj,jpi,ik,ii,ipt,jpt,jpk 650 704 INTEGER, DIMENSION(1) :: k … … 660 714 ALLOCATE(gdepw(jpk),e3t(jpk)) 661 715 ALLOCATE(gdepw_ps(jpi,jpj,jpk)) 662 ! 716 ! 663 717 IF ( ( pa0 == 0 .OR. pa1 == 0 .OR. psur == 0 ) & 664 718 .AND. ppdzmin.NE.0 .AND. pphmax.NE.0 ) THEN … … 668 722 / ( TANH((1-ppkth)/ppacr) - ppacr/(jpk-1) & 669 723 * ( LOG( COSH( (jpk - ppkth) / ppacr) ) & 670 - LOG( COSH( ( 1 - ppkth) / ppacr) ) ) ) 671 ! 724 - LOG( COSH( ( 1 - ppkth) / ppacr) ) ) ) 725 672 726 za0 = ppdzmin - za1 * TANH( (1-ppkth) / ppacr ) 673 727 zsur = - za0 - za1 * ppacr * LOG( COSH( (1-ppkth) / ppacr ) ) … … 676 730 pa0.NE.0 .AND. pa1.NE.0 ) THEN 677 731 ! 732 WRITE(*,*) 'psur,pa0,pa1 given by namelist' 678 733 zsur = psur 679 734 za0 = pa0 680 za1 = pa1 681 ! 682 ENDIF 683 684 zacr = ppacr 685 zkth = ppkth 735 za1 = pa1 736 za2 = pa2 737 ! 738 ELSE 739 ! 740 WRITE(*,*) 'ERROR ***** bad vertical grid parameters ...' 741 WRITE(*,*) ' ' 742 WRITE(*,*) 'please check values of variables' 743 WRITE(*,*) 'in namelist vertical_grid section' 744 WRITE(*,*) ' ' 745 STOP 746 ! 747 ENDIF 748 749 zacr = ppacr 750 zkth = ppkth 751 zacr2 = ppacr2 752 zkth2 = ppkth2 753 ! 754 IF( ppkth == 0. ) THEN ! uniform vertical grid 755 za1 = pphmax / FLOAT(jpk-1) 756 DO i = 1, jpk 757 gdepw(i) = ( i - 1 ) * za1 758 e3t (i) = za1 759 END DO 760 ELSE ! Madec & Imbard 1996 function 761 IF( .NOT. ldbletanh ) THEN 762 DO i = 1,jpk 763 ! 764 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr))) 765 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr)) 766 ! 767 END DO 768 ELSE 769 DO i = 1,jpk 770 ! Double tanh function 771 gdepw(i) = ( zsur + za0*i + za1 * zacr * LOG ( COSH( (i-zkth ) / zacr ) ) & 772 & + za2 * zacr2* LOG ( COSH( (i-zkth2) / zacr2 ) ) ) 773 e3t (i) = za0 + za1 * TANH( ((i+0.5)-zkth ) / zacr ) & 774 & + za2 * TANH( ((i+0.5)-zkth2) / zacr2 ) 775 END DO 776 ENDIF 777 ENDIF 686 778 ! 687 779 ! 688 780 DO i = 1,jpk 689 !690 gdepw(i) = (zsur+za0*i+za1*zacr*LOG(COSH((i-zkth)/zacr)))691 e3t(i) = (za0 + za1 * TANH(((i+0.5)-zkth)/zacr))692 781 ! 693 782 fse3t(:,:,i) = e3t(i) … … 700 789 ! 701 790 zmax = gdepw(jpk) + e3t(jpk) 702 zmin = gdepw(4) 791 IF( rn_hmin < 0. ) THEN ; i = - INT( rn_hmin ) ! from a nb of level 792 ELSE ; i = MINLOC( gdepw, mask = gdepw > rn_hmin, dim = 1 ) ! from a depth 793 ENDIF 794 zmin = gdepw(i+1) 703 795 ! 704 796 DO jj = 1, jpj -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/TOOLS/NESTING/src/agrif_types.f90
r2455 r7261 51 51 INTEGER jpizoom,jpjzoom,nb_connection_pts 52 52 ! 53 REAL*8 ppacr,ppdzmin,pphmax,ppkth,smoothing_factor,e3zps_min,e3zps_rat 54 REAL*8 psur,pa0,pa1,adatrj 53 REAL*8 rn_hmin 54 REAL*8 ppkth2, ppacr2, ppkth,ppacr,ppdzmin,pphmax,smoothing_factor,e3zps_min,e3zps_rat 55 REAL*8 psur,pa0,pa1,pa2,adatrj 55 56 ! 57 LOGICAL ldbletanh 56 58 LOGICAL partial_steps,smoothing,bathy_update 57 59 LOGICAL new_topo,removeclosedseas,dimg,iom_activated … … 70 72 ! 71 73 NAMELIST /bathymetry/new_topo,elevation_database,elevation_name,smoothing,smoothing_factor, & 72 nb_connection_pts,removeclosedseas,type_bathy_interp 74 nb_connection_pts,removeclosedseas,type_bathy_interp,rn_hmin 73 75 ! 74 76 NAMELIST /nesting/imin,imax,jmin,jmax,rho,rhot,bathy_update,updated_parent_file 75 77 ! 76 NAMELIST /vertical_grid/ppkth,ppacr,ppdzmin,pphmax,psur,pa0,pa1,N 78 NAMELIST /vertical_grid/ppkth,ppacr,ppdzmin,pphmax,psur,pa0,pa1,N,ldbletanh,pa2,ppkth2,ppacr2 77 79 ! 78 80 NAMELIST /partial_cells/partial_steps,parent_bathy_meter,parent_batmet_name,e3zps_min,e3zps_rat
Note: See TracChangeset
for help on using the changeset viewer.