- Timestamp:
- Jul 9, 2020 5:18:21 PM (4 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/surface_mod.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/surface_mod.f90
r4594 r4595 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Fix accidently commented subroutine 28 ! 29 ! 4594 2020-07-09 15:01:00Z suehring 27 30 ! Bugfix, add acc directives for scalar-roughness length 28 31 ! … … 5581 5584 CONTAINS 5582 5585 5583 !SUBROUTINE restore_surface_elements( surf_target, surf_file )5584 ! 5585 !IMPLICIT NONE5586 ! 5587 !INTEGER(iwp) :: lsp !< running index chemical species5588 ! 5589 !TYPE(surf_type) :: surf_target !< target surface type5590 !TYPE(surf_type) :: surf_file !< surface type on file5591 ! 5592 ! 5593 !IF ( ALLOCATED( surf_target%us ) .AND. ALLOCATED( surf_file%us ) ) THEN5594 !surf_target%us = surf_file%us5595 !ENDIF5596 ! 5597 !IF ( ALLOCATED( surf_target%ol ) .AND. ALLOCATED( surf_file%ol ) ) &5598 !surf_target%ol = surf_file%ol5599 ! 5600 !IF ( ALLOCATED( surf_target%pt_surface ) .AND. ALLOCATED( surf_file%pt_surface ) ) &5601 !surf_target%pt_surface = surf_file%pt_surface5602 ! 5603 !IF ( ALLOCATED( surf_target%q_surface ) .AND. ALLOCATED( surf_file%q_surface ) ) &5604 !surf_target%q_surface = surf_file%q_surface5605 ! 5606 !IF ( ALLOCATED( surf_target%vpt_surface ) .AND. ALLOCATED( surf_file%vpt_surface ) ) &5607 !surf_target%vpt_surface = surf_file%vpt_surface5608 ! 5609 !IF ( ALLOCATED( surf_target%usws ) .AND. ALLOCATED( surf_file%usws ) ) &5610 !surf_target%usws = surf_file%usws5611 ! 5612 !IF ( ALLOCATED( surf_target%vsws ) .AND. ALLOCATED( surf_file%vsws ) ) &5613 !surf_target%vsws = surf_file%vsws5614 ! 5615 !IF ( ALLOCATED( surf_target%ts ) .AND. ALLOCATED( surf_file%ts ) ) &5616 !surf_target%ts = surf_file%ts5617 ! 5618 !IF ( ALLOCATED( surf_target%shf ) .AND. ALLOCATED( surf_file%shf ) ) &5619 !surf_target%shf = surf_file%shf5620 ! 5621 !IF ( ALLOCATED( surf_target%qs ) .AND. ALLOCATED( surf_file%qs ) ) &5622 !surf_target%qs = surf_file%qs5623 ! 5624 !IF ( ALLOCATED( surf_target%qsws ) .AND. ALLOCATED( surf_file%qsws ) ) &5625 !surf_target%qsws = surf_file%qsws5626 ! 5627 !IF ( ALLOCATED( surf_target%ss ) .AND. ALLOCATED( surf_file%ss ) ) &5628 !surf_target%ss = surf_file%ss5629 ! 5630 !IF ( ALLOCATED( surf_target%ssws ) .AND. ALLOCATED( surf_file%ssws ) ) &5631 !surf_target%ssws = surf_file%ssws5632 ! 5633 !IF ( ALLOCATED( surf_target%css ) .AND. ALLOCATED( surf_file%css ) ) THEN5634 !DO lsp = 1, nvar5635 !surf_target%css(lsp,:) = surf_file%css(lsp,:)5636 !ENDDO5637 !ENDIF5638 ! 5639 !IF ( ALLOCATED( surf_target%cssws ) .AND. ALLOCATED( surf_file%cssws ) ) THEN5640 !DO lsp = 1, nvar5641 !surf_target%cssws(lsp,:) = surf_file%cssws(lsp,:)5642 !ENDDO5643 !ENDIF5644 !IF ( ALLOCATED( surf_target%qcs ) .AND. ALLOCATED( surf_file%qcs ) ) &5645 !surf_target%qcs = surf_file%qcs5646 !IF ( ALLOCATED( surf_target%qcsws ) .AND. ALLOCATED( surf_file%qcsws ) ) &5647 !surf_target%qcsws = surf_file%qcsws5648 !IF ( ALLOCATED( surf_target%ncs ) .AND. ALLOCATED( surf_file%ncs ) ) &5649 !surf_target%ncs = surf_file%ncs5650 !IF ( ALLOCATED( surf_target%ncsws ) .AND. ALLOCATED( surf_file%ncsws ) ) &5651 !surf_target%ncsws = surf_file%ncsws5652 !IF ( ALLOCATED( surf_target%qrs ) .AND. ALLOCATED( surf_file%qrs ) ) &5653 !surf_target%qrs = surf_file%qrs5654 !IF ( ALLOCATED( surf_target%qrsws ) .AND. ALLOCATED( surf_file%qrsws ) ) &5655 !surf_target%qrsws = surf_file%qrsws5656 !IF ( ALLOCATED( surf_target%nrs ) .AND. ALLOCATED( surf_file%nrs ) ) &5657 !surf_target%nrs = surf_file%nrs5658 ! 5659 !IF ( ALLOCATED( surf_target%nrsws ) .AND. ALLOCATED( surf_file%nrsws ) ) &5660 !surf_target%nrsws = surf_file%nrsws5661 !IF ( ALLOCATED( surf_target%sasws ) .AND. ALLOCATED( surf_file%sasws ) ) &5662 !surf_target%sasws = surf_file%sasws5663 !IF ( ALLOCATED( surf_target%mom_flux_uv ) .AND. ALLOCATED( surf_file%mom_flux_uv ) ) &5664 !surf_target%mom_flux_uv = surf_file%mom_flux_uv5665 !IF ( ALLOCATED( surf_target%mom_flux_w ) .AND. ALLOCATED( surf_file%mom_flux_w ) ) &5666 !surf_target%mom_flux_w = surf_file%mom_flux_w5667 !IF ( ALLOCATED( surf_target%mom_flux_tke ) .AND. ALLOCATED( surf_file%mom_flux_tke ) ) &5668 !surf_target%mom_flux_tke(0:1,:) = surf_file%mom_flux_tke(0:1,:)5669 ! 5670 ! 5671 !END SUBROUTINE restore_surface_elements5586 SUBROUTINE restore_surface_elements( surf_target, surf_file ) 5587 5588 IMPLICIT NONE 5589 5590 INTEGER(iwp) :: lsp !< running index chemical species 5591 5592 TYPE(surf_type) :: surf_target !< target surface type 5593 TYPE(surf_type) :: surf_file !< surface type on file 5594 5595 5596 IF ( ALLOCATED( surf_target%us ) .AND. ALLOCATED( surf_file%us ) ) THEN 5597 surf_target%us = surf_file%us 5598 ENDIF 5599 5600 IF ( ALLOCATED( surf_target%ol ) .AND. ALLOCATED( surf_file%ol ) ) & 5601 surf_target%ol = surf_file%ol 5602 5603 IF ( ALLOCATED( surf_target%pt_surface ) .AND. ALLOCATED( surf_file%pt_surface ) ) & 5604 surf_target%pt_surface = surf_file%pt_surface 5605 5606 IF ( ALLOCATED( surf_target%q_surface ) .AND. ALLOCATED( surf_file%q_surface ) ) & 5607 surf_target%q_surface = surf_file%q_surface 5608 5609 IF ( ALLOCATED( surf_target%vpt_surface ) .AND. ALLOCATED( surf_file%vpt_surface ) ) & 5610 surf_target%vpt_surface = surf_file%vpt_surface 5611 5612 IF ( ALLOCATED( surf_target%usws ) .AND. ALLOCATED( surf_file%usws ) ) & 5613 surf_target%usws = surf_file%usws 5614 5615 IF ( ALLOCATED( surf_target%vsws ) .AND. ALLOCATED( surf_file%vsws ) ) & 5616 surf_target%vsws = surf_file%vsws 5617 5618 IF ( ALLOCATED( surf_target%ts ) .AND. ALLOCATED( surf_file%ts ) ) & 5619 surf_target%ts = surf_file%ts 5620 5621 IF ( ALLOCATED( surf_target%shf ) .AND. ALLOCATED( surf_file%shf ) ) & 5622 surf_target%shf = surf_file%shf 5623 5624 IF ( ALLOCATED( surf_target%qs ) .AND. ALLOCATED( surf_file%qs ) ) & 5625 surf_target%qs = surf_file%qs 5626 5627 IF ( ALLOCATED( surf_target%qsws ) .AND. ALLOCATED( surf_file%qsws ) ) & 5628 surf_target%qsws = surf_file%qsws 5629 5630 IF ( ALLOCATED( surf_target%ss ) .AND. ALLOCATED( surf_file%ss ) ) & 5631 surf_target%ss = surf_file%ss 5632 5633 IF ( ALLOCATED( surf_target%ssws ) .AND. ALLOCATED( surf_file%ssws ) ) & 5634 surf_target%ssws = surf_file%ssws 5635 5636 IF ( ALLOCATED( surf_target%css ) .AND. ALLOCATED( surf_file%css ) ) THEN 5637 DO lsp = 1, nvar 5638 surf_target%css(lsp,:) = surf_file%css(lsp,:) 5639 ENDDO 5640 ENDIF 5641 5642 IF ( ALLOCATED( surf_target%cssws ) .AND. ALLOCATED( surf_file%cssws ) ) THEN 5643 DO lsp = 1, nvar 5644 surf_target%cssws(lsp,:) = surf_file%cssws(lsp,:) 5645 ENDDO 5646 ENDIF 5647 IF ( ALLOCATED( surf_target%qcs ) .AND. ALLOCATED( surf_file%qcs ) ) & 5648 surf_target%qcs = surf_file%qcs 5649 IF ( ALLOCATED( surf_target%qcsws ) .AND. ALLOCATED( surf_file%qcsws ) ) & 5650 surf_target%qcsws = surf_file%qcsws 5651 IF ( ALLOCATED( surf_target%ncs ) .AND. ALLOCATED( surf_file%ncs ) ) & 5652 surf_target%ncs = surf_file%ncs 5653 IF ( ALLOCATED( surf_target%ncsws ) .AND. ALLOCATED( surf_file%ncsws ) ) & 5654 surf_target%ncsws = surf_file%ncsws 5655 IF ( ALLOCATED( surf_target%qrs ) .AND. ALLOCATED( surf_file%qrs ) ) & 5656 surf_target%qrs = surf_file%qrs 5657 IF ( ALLOCATED( surf_target%qrsws ) .AND. ALLOCATED( surf_file%qrsws ) ) & 5658 surf_target%qrsws = surf_file%qrsws 5659 IF ( ALLOCATED( surf_target%nrs ) .AND. ALLOCATED( surf_file%nrs ) ) & 5660 surf_target%nrs = surf_file%nrs 5661 5662 IF ( ALLOCATED( surf_target%nrsws ) .AND. ALLOCATED( surf_file%nrsws ) ) & 5663 surf_target%nrsws = surf_file%nrsws 5664 IF ( ALLOCATED( surf_target%sasws ) .AND. ALLOCATED( surf_file%sasws ) ) & 5665 surf_target%sasws = surf_file%sasws 5666 IF ( ALLOCATED( surf_target%mom_flux_uv ) .AND. ALLOCATED( surf_file%mom_flux_uv ) ) & 5667 surf_target%mom_flux_uv = surf_file%mom_flux_uv 5668 IF ( ALLOCATED( surf_target%mom_flux_w ) .AND. ALLOCATED( surf_file%mom_flux_w ) ) & 5669 surf_target%mom_flux_w = surf_file%mom_flux_w 5670 IF ( ALLOCATED( surf_target%mom_flux_tke ) .AND. ALLOCATED( surf_file%mom_flux_tke ) ) & 5671 surf_target%mom_flux_tke(0:1,:) = surf_file%mom_flux_tke(0:1,:) 5672 5673 5674 END SUBROUTINE restore_surface_elements 5672 5675 5673 5676 END SUBROUTINE surface_rrd_local_mpi
Note: See TracChangeset
for help on using the changeset viewer.
