Changeset 3931
- Timestamp:
- Apr 24, 2019 4:34:28 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/bulk_cloud_model_mod.f90
r3887 r3931 371 371 bcm_header, & 372 372 bcm_actions, & 373 bcm_non_ transport_physics, &373 bcm_non_advective_processes, & 374 374 bcm_exchange_horiz, & 375 375 bcm_prognostic_equations, & … … 432 432 END INTERFACE bcm_actions 433 433 434 INTERFACE bcm_non_ transport_physics435 MODULE PROCEDURE bcm_non_ transport_physics436 MODULE PROCEDURE bcm_non_ transport_physics_ij437 END INTERFACE bcm_non_ transport_physics434 INTERFACE bcm_non_advective_processes 435 MODULE PROCEDURE bcm_non_advective_processes 436 MODULE PROCEDURE bcm_non_advective_processes_ij 437 END INTERFACE bcm_non_advective_processes 438 438 439 439 INTERFACE bcm_exchange_horiz … … 1190 1190 !> Control of microphysics for all grid points 1191 1191 !------------------------------------------------------------------------------! 1192 SUBROUTINE bcm_non_ transport_physics1192 SUBROUTINE bcm_non_advective_processes 1193 1193 1194 1194 … … 1251 1251 CALL cpu_log( log_point(51), 'microphysics', 'stop' ) 1252 1252 1253 END SUBROUTINE bcm_non_ transport_physics1253 END SUBROUTINE bcm_non_advective_processes 1254 1254 1255 1255 … … 1260 1260 !------------------------------------------------------------------------------! 1261 1261 1262 SUBROUTINE bcm_non_ transport_physics_ij( i, j )1262 SUBROUTINE bcm_non_advective_processes_ij( i, j ) 1263 1263 1264 1264 … … 1319 1319 ENDIF 1320 1320 1321 END SUBROUTINE bcm_non_ transport_physics_ij1321 END SUBROUTINE bcm_non_advective_processes_ij 1322 1322 1323 1323 -
palm/trunk/SOURCE/module_interface.f90
r3930 r3931 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! Changed chem_non_transport_physics to chem_non_advective_processes23 22 ! 24 23 ! … … 26 25 ! ----------------- 27 26 ! $Id$ 27 ! Changed non_transport_physics to non_advective_processes 28 ! 29 ! 3930 2019-04-24 14:57:18Z forkel 28 30 ! Correct/complete module_interface introduction for chemistry model 29 31 ! … … 155 157 bcm_header, & 156 158 bcm_actions, & 157 bcm_non_ transport_physics,&159 bcm_non_advective_processes, & 158 160 bcm_exchange_horiz, & 159 161 bcm_prognostic_equations, & … … 397 399 module_interface_header, & 398 400 module_interface_actions, & 399 module_interface_non_ transport_physics,&401 module_interface_non_advective_processes, & 400 402 module_interface_exchange_horiz, & 401 403 module_interface_prognostic_equations, & … … 461 463 END INTERFACE module_interface_actions 462 464 463 INTERFACE module_interface_non_ transport_physics464 MODULE PROCEDURE module_interface_non_ transport_physics465 MODULE PROCEDURE module_interface_non_ transport_physics_ij466 END INTERFACE module_interface_non_ transport_physics465 INTERFACE module_interface_non_advective_processes 466 MODULE PROCEDURE module_interface_non_advective_processes 467 MODULE PROCEDURE module_interface_non_advective_processes_ij 468 END INTERFACE module_interface_non_advective_processes 467 469 468 470 INTERFACE module_interface_exchange_horiz … … 954 956 ! Description: 955 957 ! ------------ 956 !> Compute module-specific prognostic_equations (vector-optimized)957 !------------------------------------------------------------------------------! 958 SUBROUTINE module_interface_non_ transport_physics()959 960 961 IF ( bulk_cloud_model ) CALL bcm_non_ transport_physics()958 !> Compute module-specificc non_advective_processes (vector-optimized) 959 !------------------------------------------------------------------------------! 960 SUBROUTINE module_interface_non_advective_processes() 961 962 963 IF ( bulk_cloud_model ) CALL bcm_non_advective_processes() 962 964 IF ( air_chemistry ) CALL chem_non_advective_processes() 963 965 964 966 965 END SUBROUTINE module_interface_non_ transport_physics966 967 968 !------------------------------------------------------------------------------! 969 ! Description: 970 ! ------------ 971 !> Compute module-specific prognostic_equations (cache-optimized)972 !------------------------------------------------------------------------------! 973 SUBROUTINE module_interface_non_ transport_physics_ij( i, j )967 END SUBROUTINE module_interface_non_advective_processes 968 969 970 !------------------------------------------------------------------------------! 971 ! Description: 972 ! ------------ 973 !> Compute module-specific non_advective_processes (cache-optimized) 974 !------------------------------------------------------------------------------! 975 SUBROUTINE module_interface_non_advective_processes_ij( i, j ) 974 976 975 977 … … 978 980 979 981 982 IF ( bulk_cloud_model ) CALL bcm_non_advective_processes( i, j ) 980 983 IF ( air_chemistry ) CALL chem_non_advective_processes( i, j ) 981 IF ( bulk_cloud_model ) CALL bcm_non_transport_physics( i, j ) 982 983 984 END SUBROUTINE module_interface_non_transport_physics_ij 984 985 986 END SUBROUTINE module_interface_non_advective_processes_ij 985 987 986 988 !------------------------------------------------------------------------------! -
palm/trunk/SOURCE/prognostic_equations.f90
r3929 r3931 447 447 USE module_interface, & 448 448 ONLY: module_interface_actions, & 449 module_interface_non_ transport_physics, &449 module_interface_non_advective_processes, & 450 450 module_interface_exchange_horiz, & 451 451 module_interface_prognostic_equations … … 544 544 DO j = nys, nyn 545 545 ! 546 !-- Calculate non transport physics for all other modules547 CALL module_interface_non_ transport_physics( i, j )546 !-- Calculate non advective processes for all other modules 547 CALL module_interface_non_advective_processes( i, j ) 548 548 ENDDO 549 549 ENDDO 550 550 ! 551 !-- Module Inferface for exchange horiz after non_ transport_physics but before552 !-- advection. Therefore, non_ transport_physics must not run for ghost points.551 !-- Module Inferface for exchange horiz after non_advective_processes but before 552 !-- advection. Therefore, non_advective_processes must not run for ghost points. 553 553 CALL module_interface_exchange_horiz() 554 554 !$OMP END PARALLEL … … 1218 1218 1219 1219 ! 1220 !-- Calculate non transport physics for all other modules1221 CALL module_interface_non_ transport_physics1222 ! 1223 !-- Module Inferface for exchange horiz after non_ transport_physics but before1224 !-- advection. Therefore, non_ transport_physics must not run for ghost points.1220 !-- Calculate non advective processes for all other modules 1221 CALL module_interface_non_advective_processes 1222 ! 1223 !-- Module Inferface for exchange horiz after non_advective_processes but before 1224 !-- advection. Therefore, non_advective_processes must not run for ghost points. 1225 1225 CALL module_interface_exchange_horiz() 1226 1226
Note: See TracChangeset
for help on using the changeset viewer.