- Timestamp:
- 2018-01-04T13:30:03+01:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
r6793 r9176 231 231 CASE( -1, 0 ) !== polynomial TEOS-10 / EOS-80 ==! 232 232 ! 233 !$OMP PARALLEL DO PRIVATE(zh, zt, zs, ztm, zn3, zn2, zn1, zn0, zn) 233 234 DO jk = 1, jpkm1 234 235 DO jj = 1, jpj … … 271 272 CASE( 1 ) !== simplified EOS ==! 272 273 ! 274 !$OMP PARALLEL DO PRIVATE(zt, zs, zh, ztm, zn) 273 275 DO jk = 1, jpkm1 274 276 DO jj = 1, jpj … … 393 395 ! Non-stochastic equation of state 394 396 ELSE 397 !$OMP PARALLEL DO PRIVATE(zh, zt, zs, ztm, zn3, zn2, zn1, zn0, zn0, zn) 395 398 DO jk = 1, jpkm1 396 399 DO jj = 1, jpj … … 435 438 CASE( 1 ) !== simplified EOS ==! 436 439 ! 440 !$OMP PARALLEL DO PRIVATE(zt, zs, zh, ztm, zn) 437 441 DO jk = 1, jpkm1 438 442 DO jj = 1, jpj … … 493 497 CASE( -1, 0 ) !== polynomial TEOS-10 / EOS-80 ==! 494 498 ! 499 !$OMP PARALLEL DO PRIVATE(zh, zt, zs, zn3, zn2, zn1, zn0, zn) 495 500 DO jj = 1, jpjm1 496 501 DO ji = 1, fs_jpim1 ! vector opt. … … 532 537 CASE( 1 ) !== simplified EOS ==! 533 538 ! 539 !$OMP PARALLEL DO PRIVATE(zt, zs, zh, zn) 534 540 DO jj = 1, jpjm1 535 541 DO ji = 1, fs_jpim1 ! vector opt. … … 583 589 CASE( -1, 0 ) !== polynomial TEOS-10 / EOS-80 ==! 584 590 ! 591 !$OMP PARALLEL DO PRIVATE(zh, zt, zs, ztm, zn3, zn2, zn1, zn0, zn) 585 592 DO jk = 1, jpkm1 586 593 DO jj = 1, jpj … … 640 647 CASE( 1 ) !== simplified EOS ==! 641 648 ! 649 !$OMP PARALLEL DO PRIVATE(zt, zs, zh, ztm, zn) 642 650 DO jk = 1, jpkm1 643 651 DO jj = 1, jpj … … 697 705 CASE( -1, 0 ) !== polynomial TEOS-10 / EOS-80 ==! 698 706 ! 707 !$OMP PARALLEL DO PRIVATE(zh, zt, zs, zn3, zn2, zn1, zn0, zn) 699 708 DO jj = 1, jpjm1 700 709 DO ji = 1, fs_jpim1 ! vector opt. … … 755 764 CASE( 1 ) !== simplified EOS ==! 756 765 ! 766 !$OMP PARALLEL DO PRIVATE(zt, zs, zh, zn) 757 767 DO jj = 1, jpjm1 758 768 DO ji = 1, fs_jpim1 ! vector opt. … … 910 920 IF( nn_timing == 1 ) CALL timing_start('bn2') 911 921 ! 922 !$OMP PARALLEL DO PRIVATE(zrw, zaw, zbw) 912 923 DO jk = 2, jpkm1 ! interior points only (2=< jk =< jpkm1 ) 913 924 DO jj = 1, jpj ! surface and bottom value set to zero one for all in istate.F90 … … 962 973 z1_T0 = 1._wp/40._wp 963 974 ! 975 !$OMP PARALLEL DO PRIVATE(zt, zs,ztm, zn, zd) 964 976 DO jj = 1, jpj 965 977 DO ji = 1, jpi … … 1016 1028 CASE ( -1, 1 ) !== CT,SA (TEOS-10 formulation) ==! 1017 1029 ! 1030 !$OMP PARALLEL DO PRIVATE(zs) 1018 1031 DO jj = 1, jpj 1019 1032 DO ji = 1, jpi … … 1023 1036 END DO 1024 1037 END DO 1025 ptf(:,:) = ptf(:,:) * psal(:,:) 1038 !$OMP PARALLEL DO 1039 DO jj = 1, jpj 1040 DO ji = 1, jpi 1041 ptf(ji,jj) = ptf(ji,jj) * psal(ji,jj) 1042 END DO 1043 END DO 1026 1044 ! 1027 1045 IF( PRESENT( pdep ) ) ptf(:,:) = ptf(:,:) - 7.53e-4 * pdep(:,:) … … 1029 1047 CASE ( 0 ) !== PT,SP (UNESCO formulation) ==! 1030 1048 ! 1031 ptf(:,:) = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal(:,:) ) & 1032 & - 2.154996e-4_wp * psal(:,:) ) * psal(:,:) 1049 !$OMP PARALLEL DO 1050 DO jj = 1, jpj 1051 DO ji = 1, jpi 1052 ptf(ji,jj) = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal(ji,jj) ) & 1053 & - 2.154996e-4_wp * psal(ji,jj) ) * psal(ji,jj) 1054 END DO 1055 END DO 1033 1056 ! 1034 1057 IF( PRESENT( pdep ) ) ptf(:,:) = ptf(:,:) - 7.53e-4 * pdep(:,:) … … 1125 1148 CASE( -1, 0 ) !== polynomial TEOS-10 / EOS-80 ==! 1126 1149 ! 1150 !$OMP PARALLEL DO PRIVATE(zh, zt, zs, ztm, zn2, zn1, zn0, zn) 1127 1151 DO jk = 1, jpkm1 1128 1152 DO jj = 1, jpj … … 1188 1212 CASE( 1 ) !== Vallis (2006) simplified EOS ==! 1189 1213 ! 1214 !$OMP PARALLEL DO PRIVATE(zt, zs, zh, ztm, zn) 1190 1215 DO jk = 1, jpkm1 1191 1216 DO jj = 1, jpj
Note: See TracChangeset
for help on using the changeset viewer.