Changeset 129 for palm/trunk/SOURCE/prognostic_equations.f90
- Timestamp:
- Oct 30, 2007 12:12:24 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/prognostic_equations.f90
r110 r129 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! add wall_*flux to parameter list of calls of diffusion_s 7 7 ! 8 8 ! Former revisions: … … 369 369 !-- Tendency terms 370 370 IF ( scalar_advec == 'bc-scheme' ) THEN 371 CALL diffusion_s( i, j, ddzu, ddzw, kh, pt, shf, tswst, tend ) 371 CALL diffusion_s( i, j, ddzu, ddzw, kh, pt, shf, tswst, & 372 wall_heatflux, tend ) 372 373 ELSE 373 374 IF ( tsc(2) == 2.0 .OR. timestep_scheme(1:5) == 'runge' ) THEN … … 383 384 THEN 384 385 CALL diffusion_s( i, j, ddzu, ddzw, kh_m, pt_m, shf_m, & 385 tswst_m, tend )386 tswst_m, wall_heatflux, tend ) 386 387 ELSE 387 CALL diffusion_s( i, j, ddzu, ddzw, kh, pt, shf, tswst, tend ) 388 CALL diffusion_s( i, j, ddzu, ddzw, kh, pt, shf, tswst, & 389 wall_heatflux, tend ) 388 390 ENDIF 389 391 ENDIF … … 471 473 IF ( scalar_advec == 'bc-scheme' ) THEN 472 474 CALL diffusion_s( i, j, ddzu, ddzw, kh, sa, saswsb, saswst, & 473 tend )475 wall_salinityflux, tend ) 474 476 ELSE 475 477 IF ( tsc(2) == 2.0 .OR. timestep_scheme(1:5) == 'runge' ) THEN … … 483 485 ENDIF 484 486 CALL diffusion_s( i, j, ddzu, ddzw, kh, sa, saswsb, saswst, & 485 tend )487 wall_salinityflux, tend ) 486 488 ENDIF 487 489 … … 563 565 !-- Tendency-terms 564 566 IF ( scalar_advec == 'bc-scheme' ) THEN 565 CALL diffusion_s( i, j, ddzu, ddzw, kh, q, qsws, qswst, tend ) 567 CALL diffusion_s( i, j, ddzu, ddzw, kh, q, qsws, qswst, & 568 wall_qflux, tend ) 566 569 ELSE 567 570 IF ( tsc(2) == 2.0 .OR. timestep_scheme(1:5) == 'runge' ) THEN … … 577 580 THEN 578 581 CALL diffusion_s( i, j, ddzu, ddzw, kh_m, q_m, qsws_m, & 579 qswst_m, tend )582 qswst_m, wall_qflux, tend ) 580 583 ELSE 581 584 CALL diffusion_s( i, j, ddzu, ddzw, kh, q, qsws, qswst, & 582 tend )585 wall_qflux, tend ) 583 586 ENDIF 584 587 ENDIF … … 974 977 THEN 975 978 CALL diffusion_s( i, j, ddzu, ddzw, kh_m, pt_m, shf_m, & 976 tswst_m, tend ) 977 ELSE 978 CALL diffusion_s( i, j, ddzu, ddzw, kh, pt, shf, tswst, tend ) 979 tswst_m, wall_heatflux, tend ) 980 ELSE 981 CALL diffusion_s( i, j, ddzu, ddzw, kh, pt, shf, tswst, & 982 wall_heatflux, tend ) 979 983 ENDIF 980 984 … … 1033 1037 ENDIF 1034 1038 CALL diffusion_s( i, j, ddzu, ddzw, kh, sa, saswsb, saswst, & 1035 tend )1039 wall_salinityflux, tend ) 1036 1040 1037 1041 CALL user_actions( i, j, 'sa-tendency' ) … … 1087 1091 THEN 1088 1092 CALL diffusion_s( i, j, ddzu, ddzw, kh_m, q_m, qsws_m, & 1089 qswst_m, tend )1093 qswst_m, wall_qflux, tend ) 1090 1094 ELSE 1091 1095 CALL diffusion_s( i, j, ddzu, ddzw, kh, q, qsws, qswst, & 1092 tend )1096 wall_qflux, tend ) 1093 1097 ENDIF 1094 1098 … … 1487 1491 !-- pt-tendency terms with no communication 1488 1492 IF ( scalar_advec == 'bc-scheme' ) THEN 1489 CALL diffusion_s( ddzu, ddzw, kh, pt, shf, tswst, tend ) 1493 CALL diffusion_s( ddzu, ddzw, kh, pt, shf, tswst, wall_heatflux, & 1494 tend ) 1490 1495 ELSE 1491 1496 IF ( tsc(2) == 2.0 .OR. timestep_scheme(1:5) == 'runge' ) THEN … … 1499 1504 ENDIF 1500 1505 IF ( tsc(2) == 2.0 .AND. timestep_scheme(1:8) == 'leapfrog' ) THEN 1501 CALL diffusion_s( ddzu, ddzw, kh_m, pt_m, shf_m, tswst_m, tend ) 1506 CALL diffusion_s( ddzu, ddzw, kh_m, pt_m, shf_m, tswst_m, & 1507 wall_heatflux, tend ) 1502 1508 ELSE 1503 CALL diffusion_s( ddzu, ddzw, kh, pt, shf, tswst, tend ) 1509 CALL diffusion_s( ddzu, ddzw, kh, pt, shf, tswst, wall_heatflux, & 1510 tend ) 1504 1511 ENDIF 1505 1512 ENDIF … … 1589 1596 1590 1597 ! 1591 !-- Scalar/q-tendency terms with no communication1598 !-- sa-tendency terms with no communication 1592 1599 IF ( scalar_advec == 'bc-scheme' ) THEN 1593 CALL diffusion_s( ddzu, ddzw, kh, sa, saswsb, saswst, tend ) 1600 CALL diffusion_s( ddzu, ddzw, kh, sa, saswsb, saswst, & 1601 wall_salinityflux, tend ) 1594 1602 ELSE 1595 1603 IF ( tsc(2) == 2.0 .OR. timestep_scheme(1:5) == 'runge' ) THEN … … 1602 1610 ENDIF 1603 1611 ENDIF 1604 CALL diffusion_s( ddzu, ddzw, kh, sa, saswsb, saswst, tend ) 1612 CALL diffusion_s( ddzu, ddzw, kh, sa, saswsb, saswst, & 1613 wall_salinityflux, tend ) 1605 1614 ENDIF 1606 1615 … … 1689 1698 !-- Scalar/q-tendency terms with no communication 1690 1699 IF ( scalar_advec == 'bc-scheme' ) THEN 1691 CALL diffusion_s( ddzu, ddzw, kh, q, qsws, qswst, tend )1700 CALL diffusion_s( ddzu, ddzw, kh, q, qsws, qswst, wall_qflux, tend ) 1692 1701 ELSE 1693 1702 IF ( tsc(2) == 2.0 .OR. timestep_scheme(1:5) == 'runge' ) THEN … … 1701 1710 ENDIF 1702 1711 IF ( tsc(2) == 2.0 .AND. timestep_scheme(1:8) == 'leapfrog' ) THEN 1703 CALL diffusion_s( ddzu, ddzw, kh_m, q_m, qsws_m, qswst_m, tend ) 1704 ELSE 1705 CALL diffusion_s( ddzu, ddzw, kh, q, qsws, qswst, tend ) 1712 CALL diffusion_s( ddzu, ddzw, kh_m, q_m, qsws_m, qswst_m, & 1713 wall_qflux, tend ) 1714 ELSE 1715 CALL diffusion_s( ddzu, ddzw, kh, q, qsws, qswst, & 1716 wall_qflux, tend ) 1706 1717 ENDIF 1707 1718 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.