Changeset 1972 for palm/trunk/SOURCE/netcdf_interface_mod.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/netcdf_interface_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/netcdf_interface_mod.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix: wrong units for lsm quantities.
+! Definition of grids for land surface quantities is now done directly in the
+! respective module.
 ! 
 ! Former revisions:
@@ -208 +210 @@
              'm2/s2        ', 'm2/s2        ', 'kg m/s       ',                &
              'm            ', 'kg/kg        ', 'kg m/(kg s)  ',                &
-             'kg/kg        ', '             ', '             ',                &
-             '             ', '             ', '             ',                &
-             'W/m2         ', 's/m          ', '             ',                &
+             'kg/kg        ', 'W/m2         ', 'W/m2         ',                &
+             'W/m2         ', 'W/m2         ', 'W/m2         ',                &
+             'W/m2         ', 's/m          ', 's/m          ',                &
              'W/m2         ', 'W/m2         ', 'W/m2         ',                &
              'W/m2         ', 'W/m2         ', '             ',                &
@@ -400 +402 @@
 
     USE land_surface_model_mod,                                                &
-        ONLY: land_surface, nzb_soil, nzt_soil, nzs, zs
+        ONLY: land_surface, lsm_define_netcdf_grid, nzb_soil, nzt_soil, nzs, zs
 
     USE pegrid
@@ -758 +760 @@
                    grid_y = 'y'
                    grid_z = 'zw'
-!
-!--             soil grid
-                CASE ( 'm_soil', 't_soil' )
-
-                   grid_x = 'x'
-                   grid_y = 'y'
-                   grid_z = 'zs'
+
 
                 CASE DEFAULT
+
+!
+!--                Check for land surface quantities
+                   IF ( land_surface )  THEN
+                      CALL lsm_define_netcdf_grid( domask(mid,av,i), found,    &
+                                                   grid_x, grid_y, grid_z )
+                   ENDIF
+
 !
 !--                Check for user-defined quantities
-                   CALL user_define_netcdf_grid( domask(mid,av,i), found,      &
-                                                 grid_x, grid_y, grid_z )
+                   IF ( .NOT. found )  THEN
+                      CALL user_define_netcdf_grid( domask(mid,av,i), found,   &
+                                                    grid_x, grid_y, grid_z )
+                   ENDIF
 
                    IF ( .NOT. found )  THEN
@@ -1258 +1264 @@
                    grid_y = 'y'
                    grid_z = 'zw'
-!
-!--             soil grid
-                CASE ( 'm_soil', 't_soil' )
-
-                   grid_x = 'x'
-                   grid_y = 'y'
-                   grid_z = 'zs'
+
 
                 CASE DEFAULT
-!
+
+!
+!--                Check for land surface quantities
+                   IF ( land_surface )  THEN
+                      CALL lsm_define_netcdf_grid( do3d(av,i), found, grid_x,  &
+                                                    grid_y, grid_z )
+                   ENDIF
+                   
 !--                Check for user-defined quantities
-                   CALL user_define_netcdf_grid( do3d(av,i), found, grid_x, &
-                                                 grid_y, grid_z )
+                   IF ( .NOT. found )  THEN
+                      CALL user_define_netcdf_grid( do3d(av,i), found, grid_x, &
+                                                    grid_y, grid_z )
+                   ENDIF
 
                    IF ( .NOT. found )  THEN
@@ -1992 +2001 @@
 
 !
-!--             Write zs data
+!--          Write zs data
              IF ( land_surface )  THEN
                 ns_do = 0