Changeset 1972 for palm/trunk/SOURCE/data_output_3d.f90

Timestamp:

Jul 26, 2016 7:52:02 AM (8 years ago)

Author:

maronga

Message:

further modularization of land surface model (2D/3D output and restart data)

File:

• palm/trunk/SOURCE/data_output_3d.f90 (modified) (6 diffs)

palm/trunk/SOURCE/data_output_3d.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! Output of land surface quantities is now done directly in the respective module.
+! Unnecessary directive __parallel removed.
 ! 
 ! Former revisions:
@@ -144 +145 @@
     
     USE land_surface_model_mod,                                                &
-        ONLY: m_soil, m_soil_av, nzb_soil, nzt_soil, t_soil, t_soil_av
+        ONLY: land_surface, lsm_data_output_3d, nzb_soil, nzt_soil
 
 #if defined( __netcdf )
@@ -272 +273 @@
              ELSE
                 to_be_resorted => lpt_av
-             ENDIF
-
-          CASE ( 'm_soil' )
-             nzb_do = nzb_soil
-             nzt_do = nzt_soil
-!
-!--          For soil model quantities, it is required to re-allocate local_pf
-             DEALLOCATE ( local_pf )
-             ALLOCATE( local_pf(nxlg:nxrg,nysg:nyng,nzb_do:nzt_do) )
-
-             IF ( av == 0 )  THEN
-                to_be_resorted => m_soil
-             ELSE
-                to_be_resorted => m_soil_av
              ENDIF
 
@@ -581 +568 @@
              ENDIF
 
-          CASE ( 't_soil' )
-             nzb_do = nzb_soil
-             nzt_do = nzt_soil
-!
-!--          For soil model quantities, it is required to re-allocate local_pf
-             DEALLOCATE ( local_pf )
-             ALLOCATE( local_pf(nxlg:nxrg,nysg:nyng,nzb_do:nzt_do) )
-
-             IF ( av == 0 )  THEN
-                to_be_resorted => t_soil
-             ELSE
-                to_be_resorted => t_soil_av
-             ENDIF
-
           CASE ( 'u' )
              IF ( av == 0 )  THEN
@@ -624 +597 @@
 
           CASE DEFAULT
+
+!
+!--          Land surface quantity
+             IF ( land_surface )  THEN
+!
+!--             For soil model quantities, it is required to re-allocate local_pf
+                nzb_do = nzb_soil
+                nzt_do = nzt_soil
+
+                DEALLOCATE ( local_pf )
+                ALLOCATE( local_pf(nxlg:nxrg,nysg:nyng,nzb_do:nzt_do) )
+
+                CALL lsm_data_output_3d( av, do3d(av,if), found, local_pf )
+                resorted = .TRUE.
+             ENDIF
+
 !
 !--          User defined quantity
-             CALL user_data_output_3d( av, do3d(av,if), found, local_pf,       &
-                                       nzb_do, nzt_do )
-             resorted = .TRUE.
+             IF ( .NOT. found )  THEN
+                CALL user_data_output_3d( av, do3d(av,if), found, local_pf,    &
+                                          nzb_do, nzt_do )
+                resorted = .TRUE.
+             ENDIF
 
              IF ( .NOT. found )  THEN
@@ -667 +658 @@
                 WRITE ( 30 )  local_pf(:,:,nzb_do:nzt_do)
              ENDIF
-#if defined( __parallel )
+
              CALL MPI_BARRIER( comm2d, ierr )
-#endif
+
           ENDDO