- Timestamp:
- Aug 24, 2016 10:22:32 AM (8 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/pmc_interface_mod.f90 (modified) (19 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/pmc_interface_mod.f90
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/palm/branches/forwind/SOURCE/pmc_interface_mod.f90 1564-1913 /palm/trunk/SOURCE/pmc_interface_mod.f90 merged eligible /palm/branches/fricke/SOURCE/pmc_interface_mod.f90 942-977 /palm/branches/hoffmann/SOURCE/pmc_interface_mod.f90 989-1052 /palm/branches/letzel/masked_output/SOURCE/pmc_interface_mod.f90 296-409 /palm/branches/suehring/pmc_interface_mod.f90 423-666
r2001 r2003 21 21 ! Current revisions: 22 22 ! ------------------ 23 ! 23 ! Humidity and passive scalar also separated in nesting mode 24 24 ! 25 25 ! Former revisions: … … 123 123 USE arrays_3d, & 124 124 ONLY: dzu, dzw, e, e_p, e_1, e_2, pt, pt_p, pt_1, pt_2, q, q_p, q_1, & 125 q_2, u, u_p, u_1, u_2, v, v_p, v_1, v_2, w, w_p, w_1, w_2, zu,&126 z w, z0125 q_2, s, s_2, u, u_p, u_1, u_2, v, v_p, v_1, v_2, w, w_p, w_1, w_2, & 126 zu, zw, z0 127 127 #endif 128 128 … … 243 243 REAL(wp), SAVE, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: wc !: 244 244 REAL(wp), SAVE, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: qc !: 245 REAL(wp), SAVE, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: sc !: 245 246 246 247 ! … … 915 916 CALL pmc_set_dataarray_name( 'coarse', 'pt' ,'fine', 'pt', ierr ) 916 917 ENDIF 917 IF ( humidity .OR. passive_scalar) THEN918 IF ( humidity ) THEN 918 919 CALL pmc_set_dataarray_name( 'coarse', 'q' ,'fine', 'q', ierr ) 920 ENDIF 921 IF ( passive_scalar ) THEN 922 CALL pmc_set_dataarray_name( 'coarse', 's' ,'fine', 's', ierr ) 919 923 ENDIF 920 924 … … 2521 2525 IF ( TRIM(name) == "pt" ) p_3d => pt 2522 2526 IF ( TRIM(name) == "q" ) p_3d => q 2527 IF ( TRIM(name) == "s" ) p_3d => s 2523 2528 ! 2524 2529 !-- Next line is just an example for a 2D array (not active for coupling!) … … 2552 2557 IF ( TRIM(name) == "pt" ) p_3d_sec => pt_2 2553 2558 IF ( TRIM(name) == "q" ) p_3d_sec => q_2 2559 IF ( TRIM(name) == "s" ) p_3d_sec => s_2 2554 2560 2555 2561 IF ( ASSOCIATED( p_3d ) ) THEN … … 2623 2629 IF ( .NOT. ALLOCATED( qc ) ) ALLOCATE( qc(0:nzc+1, js:je, is:ie) ) 2624 2630 p_3d => qc 2631 ELSEIF ( TRIM( name ) == "s") THEN 2632 IF ( .NOT. ALLOCATED( sc ) ) ALLOCATE( sc(0:nzc+1, js:je, is:ie) ) 2633 p_3d => sc 2625 2634 !ELSEIF (trim(name) == "z0") then 2626 2635 !IF (.not.allocated(z0c)) allocate(z0c(js:je, is:ie)) … … 2722 2731 r1yo, r2yo, r1zo, r2zo, nzb_s_inner, 's' ) 2723 2732 ENDIF 2724 IF ( humidity .OR. passive_scalar) THEN2733 IF ( humidity ) THEN 2725 2734 CALL pmci_interp_tril_all ( q, qc, ico, jco, kco, r1xo, r2xo, r1yo, & 2735 r2yo, r1zo, r2zo, nzb_s_inner, 's' ) 2736 ENDIF 2737 IF ( passive_scalar ) THEN 2738 CALL pmci_interp_tril_all ( s, sc, ico, jco, kco, r1xo, r2xo, r1yo, & 2726 2739 r2yo, r1zo, r2zo, nzb_s_inner, 's' ) 2727 2740 ENDIF … … 3367 3380 nzt_topo_nestbc_l, 'l', 's' ) 3368 3381 ENDIF 3369 IF ( humidity .OR. passive_scalar) THEN3382 IF ( humidity ) THEN 3370 3383 CALL pmci_interp_tril_lr( q, qc, ico, jco, kco, r1xo, r2xo, & 3384 r1yo, r2yo, r1zo, r2zo, nzb_s_inner, & 3385 logc_u_l, logc_ratio_u_l, & 3386 nzt_topo_nestbc_l, 'l', 's' ) 3387 ENDIF 3388 IF ( passive_scalar ) THEN 3389 CALL pmci_interp_tril_lr( s, sc, ico, jco, kco, r1xo, r2xo, & 3371 3390 r1yo, r2yo, r1zo, r2zo, nzb_s_inner, & 3372 3391 logc_u_l, logc_ratio_u_l, & … … 3382 3401 CALL pmci_extrap_ifoutflow_lr( pt,nzb_s_inner, 'l', 's' ) 3383 3402 ENDIF 3384 IF ( humidity .OR. passive_scalar) THEN3403 IF ( humidity ) THEN 3385 3404 CALL pmci_extrap_ifoutflow_lr( q, nzb_s_inner, 'l', 's' ) 3405 ENDIF 3406 IF ( passive_scalar ) THEN 3407 CALL pmci_extrap_ifoutflow_lr( s, nzb_s_inner, 'l', 's' ) 3386 3408 ENDIF 3387 3409 ENDIF … … 3414 3436 nzt_topo_nestbc_r, 'r', 's' ) 3415 3437 ENDIF 3416 IF ( humidity .OR. passive_scalar) THEN3438 IF ( humidity ) THEN 3417 3439 CALL pmci_interp_tril_lr( q, qc, ico, jco, kco, r1xo, r2xo, & 3440 r1yo, r2yo, r1zo, r2zo, nzb_s_inner, & 3441 logc_u_r, logc_ratio_u_r, & 3442 nzt_topo_nestbc_r, 'r', 's' ) 3443 ENDIF 3444 IF ( passive_scalar ) THEN 3445 CALL pmci_interp_tril_lr( s, sc, ico, jco, kco, r1xo, r2xo, & 3418 3446 r1yo, r2yo, r1zo, r2zo, nzb_s_inner, & 3419 3447 logc_u_r, logc_ratio_u_r, & … … 3429 3457 CALL pmci_extrap_ifoutflow_lr( pt,nzb_s_inner, 'r', 's' ) 3430 3458 ENDIF 3431 IF ( humidity .OR. passive_scalar) THEN3459 IF ( humidity ) THEN 3432 3460 CALL pmci_extrap_ifoutflow_lr( q, nzb_s_inner, 'r', 's' ) 3461 ENDIF 3462 IF ( passive_scalar ) THEN 3463 CALL pmci_extrap_ifoutflow_lr( s, nzb_s_inner, 'r', 's' ) 3433 3464 ENDIF 3434 3465 ENDIF … … 3461 3492 nzt_topo_nestbc_s, 's', 's' ) 3462 3493 ENDIF 3463 IF ( humidity .OR. passive_scalar) THEN3494 IF ( humidity ) THEN 3464 3495 CALL pmci_interp_tril_sn( q, qc, ico, jco, kco, r1xo, r2xo, & 3496 r1yo,r2yo, r1zo, r2zo, nzb_s_inner, & 3497 logc_u_s, logc_ratio_u_s, & 3498 nzt_topo_nestbc_s, 's', 's' ) 3499 ENDIF 3500 IF ( passive_scalar ) THEN 3501 CALL pmci_interp_tril_sn( s, sc, ico, jco, kco, r1xo, r2xo, & 3465 3502 r1yo,r2yo, r1zo, r2zo, nzb_s_inner, & 3466 3503 logc_u_s, logc_ratio_u_s, & … … 3476 3513 CALL pmci_extrap_ifoutflow_sn( pt,nzb_s_inner, 's', 's' ) 3477 3514 ENDIF 3478 IF ( humidity .OR. passive_scalar) THEN3515 IF ( humidity ) THEN 3479 3516 CALL pmci_extrap_ifoutflow_sn( q, nzb_s_inner, 's', 's' ) 3517 ENDIF 3518 IF ( passive_scalar ) THEN 3519 CALL pmci_extrap_ifoutflow_sn( s, nzb_s_inner, 's', 's' ) 3480 3520 ENDIF 3481 3521 ENDIF … … 3508 3548 nzt_topo_nestbc_n, 'n', 's' ) 3509 3549 ENDIF 3510 IF ( humidity .OR. passive_scalar) THEN3550 IF ( humidity ) THEN 3511 3551 CALL pmci_interp_tril_sn( q, qc, ico, jco, kco, r1xo, r2xo, & 3552 r1yo, r2yo, r1zo, r2zo, nzb_s_inner, & 3553 logc_u_n, logc_ratio_u_n, & 3554 nzt_topo_nestbc_n, 'n', 's' ) 3555 ENDIF 3556 IF ( passive_scalar ) THEN 3557 CALL pmci_interp_tril_sn( s, sc, ico, jco, kco, r1xo, r2xo, & 3512 3558 r1yo, r2yo, r1zo, r2zo, nzb_s_inner, & 3513 3559 logc_u_n, logc_ratio_u_n, & … … 3523 3569 CALL pmci_extrap_ifoutflow_sn( pt,nzb_s_inner, 'n', 's' ) 3524 3570 ENDIF 3525 IF ( humidity .OR. passive_scalar) THEN3571 IF ( humidity ) THEN 3526 3572 CALL pmci_extrap_ifoutflow_sn( q, nzb_s_inner, 'n', 's' ) 3573 ENDIF 3574 IF ( passive_scalar ) THEN 3575 CALL pmci_extrap_ifoutflow_sn( s, nzb_s_inner, 'n', 's' ) 3527 3576 ENDIF 3528 3577 … … 3547 3596 r2yo, r1zo, r2zo, 's' ) 3548 3597 ENDIF 3549 IF ( humidity .OR. passive_scalar) THEN3598 IF ( humidity ) THEN 3550 3599 CALL pmci_interp_tril_t( q, qc, ico, jco, kco, r1xo, r2xo, r1yo, & 3600 r2yo, r1zo, r2zo, 's' ) 3601 ENDIF 3602 IF ( passive_scalar ) THEN 3603 CALL pmci_interp_tril_t( s, sc, ico, jco, kco, r1xo, r2xo, r1yo, & 3551 3604 r2yo, r1zo, r2zo, 's' ) 3552 3605 ENDIF … … 3560 3613 CALL pmci_extrap_ifoutflow_t( pt, 's' ) 3561 3614 ENDIF 3562 IF ( humidity .OR. passive_scalar) THEN3615 IF ( humidity ) THEN 3563 3616 CALL pmci_extrap_ifoutflow_t( q, 's' ) 3617 ENDIF 3618 IF ( passive_scalar ) THEN 3619 CALL pmci_extrap_ifoutflow_t( s, 's' ) 3564 3620 ENDIF 3565 3621 ENDIF … … 3586 3642 kfuo, ijfc_s, 's' ) 3587 3643 ENDIF 3588 IF ( humidity .OR. passive_scalar) THEN3644 IF ( humidity ) THEN 3589 3645 CALL pmci_anterp_tophat( q, qc, kctu, iflo, ifuo, jflo, jfuo, kflo, & 3646 kfuo, ijfc_s, 's' ) 3647 ENDIF 3648 IF ( passive_scalar ) THEN 3649 CALL pmci_anterp_tophat( s, sc, kctu, iflo, ifuo, jflo, jfuo, kflo, & 3590 3650 kfuo, ijfc_s, 's' ) 3591 3651 ENDIF -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.
