Changeset 4329 for palm/trunk/SOURCE/ocean_mod.f90
- Timestamp:
- Dec 10, 2019 3:46:36 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/ocean_mod.f90
r4272 r4329 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Renamed wall_flags_0 to wall_flags_static_0 28 ! 29 ! 4272 2019-10-23 15:18:57Z schwenkel 27 30 ! Further modularization of boundary conditions: moved boundary conditions to 28 31 ! respective modules … … 86 89 87 90 USE indices, & 88 ONLY: advc_flags_s, nxl, nxr, nyn, nys, nzb, nzt, wall_flags_ 091 ONLY: advc_flags_s, nxl, nxr, nyn, nys, nzb, nzt, wall_flags_static_0 89 92 90 93 USE surface_mod, & … … 968 971 USE indices, & 969 972 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt, & 970 wall_flags_ 0973 wall_flags_static_0 971 974 972 975 IMPLICIT NONE … … 1037 1040 local_pf(i,j,k) = MERGE( to_be_resorted(k,j,i), & 1038 1041 REAL( fill_value, KIND = wp ), & 1039 BTEST( wall_flags_ 0(k,j,i), flag_nr ) )1042 BTEST( wall_flags_static_0(k,j,i), flag_nr ) ) 1040 1043 ENDDO 1041 1044 ENDDO … … 1063 1066 USE indices, & 1064 1067 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt, & 1065 wall_flags_ 01068 wall_flags_static_0 1066 1069 1067 1070 IMPLICIT NONE … … 1129 1132 local_pf(i,j,k) = MERGE( to_be_resorted(k,j,i), & 1130 1133 REAL( fill_value, KIND = wp ), & 1131 BTEST( wall_flags_ 0(k,j,i), flag_nr ) )1134 BTEST( wall_flags_static_0(k,j,i), flag_nr ) ) 1132 1135 ENDDO 1133 1136 ENDDO … … 1679 1682 ) & 1680 1683 * MERGE( 1.0_wp, 0.0_wp, & 1681 BTEST( wall_flags_ 0(k,j,i), 0 ) &1684 BTEST( wall_flags_static_0(k,j,i), 0 ) & 1682 1685 ) 1683 1686 IF ( sa_p(k,j,i) < 0.0_wp ) sa_p(k,j,i) = 0.1_wp * sa(k,j,i) … … 1826 1829 * ( sa(k,j,i) - sa_init(k) ) & 1827 1830 ) * MERGE( 1.0_wp, 0.0_wp, & 1828 BTEST( wall_flags_ 0(k,j,i), 0 ) )1831 BTEST( wall_flags_static_0(k,j,i), 0 ) ) 1829 1832 1830 1833 IF ( sa_p(k,j,i) < 0.0_wp ) sa_p(k,j,i) = 0.1_wp * sa(k,j,i)
Note: See TracChangeset
for help on using the changeset viewer.