Changeset 2772 for palm

Timestamp:

Jan 29, 2018 1:10:35 PM (7 years ago)

Author:

suehring

Message:

Enable initialization via inifor without running land-surface model; small bugfix in chemistry model string treatment

Location:

palm/trunk/SOURCE

Files:

• chemistry_model_mod.f90 (modified) (3 diffs)
• netcdf_data_input_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/chemistry_model_mod.f90

@@ -27 +27 @@
 ! -----------------
 ! $Id$
+! Bugfix in string handling
+! 
+! 2768 2018-01-24 15:38:29Z kanani
 ! Shorten lines to maximum length of 132 characters
 ! 
@@ -816 +819 @@
 
             IF(myid == 0)  THEN
-               WRITE(6,'(a,3x,a,3x,a,e12.4)')  '   Species:     ',chem_species(lsp)%name(1:7),' & 
-                                        Initial Value = ',chem_species(lsp)%conc(nzb,nysg,nxlg)
+               WRITE(6,'(a,3x,a,3x,a,e12.4)')  '   Species:     ',chem_species(lsp)%name(1:7), & 
+                                        'Initial Value = ',chem_species(lsp)%conc(nzb,nysg,nxlg)
             ENDIF
          ENDDO
@@ -1241 +1244 @@
        DO lsp=1,nspec
           IF (TRIM(spec_name) == TRIM(chem_species(lsp)%name))   THEN
-             IF(myid == 0 .AND. chem_debug0 )  WRITE(6,*) 'Output of species ',TRIM(variable),'  &
-                                                          ',TRIM(chem_species(lsp)%name)       
+             IF(myid == 0 .AND. chem_debug0 )  WRITE(6,*) 'Output of species ' // TRIM(variable)  //  &
+                                                          TRIM(chem_species(lsp)%name)       
              
              IF (av == 0) THEN

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Initialization of simulation independent on land-surface model.
+! 
+! 2746 2018-01-15 12:06:04Z suehring
 ! Read plant-canopy variables independently on land-surface model usage
 ! 
@@ -549 +552 @@
                 CALL inquire_variable_names( id_surf, var_names )
 
-
 !
 !--             Read leaf area density - resolved vegetation
@@ -567 +569 @@
                                                    nys:nyn,nxl:nxr) )
 
-                      DO  i = nxl, nxr
-                         DO  j = nys, nyn
-                            CALL get_variable( id_surf, 'leaf_area_density',   &
-                                               i, j,                           &
-                                               leaf_area_density_f%var(:,j,i) ) 
-                         ENDDO
+                   DO  i = nxl, nxr
+                      DO  j = nys, nyn
+                         CALL get_variable( id_surf, 'leaf_area_density',      &
+                                            i, j,                              &
+                                            leaf_area_density_f%var(:,j,i) ) 
                       ENDDO
+                   ENDDO
                 ELSE
                    leaf_area_density_f%from_file = .FALSE. 
@@ -1882 +1884 @@
 
        USE control_parameters,                                                 &
-           ONLY:  bc_lr_cyc, bc_ns_cyc, forcing, humidity, message_string,     &
-                  neutral, surface_pressure
+           ONLY:  bc_lr_cyc, bc_ns_cyc, forcing, humidity, land_surface,       &
+                  message_string, neutral, surface_pressure
 
        USE indices,                                                            &
@@ -2167 +2169 @@
 !
 !--          Read soil moisture
-             IF ( check_existence( var_names, 'init_soil_m' ) )  THEN
-!
-!--             Read attributes for the fill value and level-of-detail
-                CALL get_attribute( id_dynamic, char_fill, init_3d%fill_msoil, &
-                                    .FALSE., 'init_soil_m' )
-                CALL get_attribute( id_dynamic, char_lod, init_3d%lod_msoil,   &
-                                    .FALSE., 'init_soil_m' )
-!
-!--             level-of-detail 1 - read initialization profile
-                IF ( init_3d%lod_msoil == 1 )  THEN
-                   ALLOCATE( init_3d%msoil_init(0:init_3d%nzs-1) )
-
-                   CALL get_variable( id_dynamic, 'init_soil_m',               &
-                                      init_3d%msoil_init(0:init_3d%nzs-1) )
-!
-!--             level-of-detail 2 - read 3D initialization data
-                ELSEIF ( init_3d%lod_msoil == 2 )  THEN  ! need to be corrected
-                   ALLOCATE ( init_3d%msoil(0:init_3d%nzs-1,nys:nyn,nxl:nxr) )
-                   DO  i = nxl, nxr
-                      DO  j = nys, nyn
-                         CALL get_variable( id_dynamic, 'init_soil_m', i, j,   &
-                                            init_3d%msoil(0:init_3d%nzs-1,j,i) )
+             IF ( land_surface )  THEN
+                IF ( check_existence( var_names, 'init_soil_m' ) )  THEN
+!
+!--                Read attributes for the fill value and level-of-detail
+                   CALL get_attribute( id_dynamic, char_fill,                  &
+                                       init_3d%fill_msoil,                     &
+                                       .FALSE., 'init_soil_m' )
+                   CALL get_attribute( id_dynamic, char_lod,                   &
+                                       init_3d%lod_msoil,                      &
+                                       .FALSE., 'init_soil_m' )
+!
+!--                level-of-detail 1 - read initialization profile
+                   IF ( init_3d%lod_msoil == 1 )  THEN
+                      ALLOCATE( init_3d%msoil_init(0:init_3d%nzs-1) )
+
+                      CALL get_variable( id_dynamic, 'init_soil_m',            &
+                                         init_3d%msoil_init(0:init_3d%nzs-1) )
+!
+!--                level-of-detail 2 - read 3D initialization data
+                   ELSEIF ( init_3d%lod_msoil == 2 )  THEN  ! need to be corrected
+                      ALLOCATE ( init_3d%msoil(0:init_3d%nzs-1,nys:nyn,nxl:nxr) )
+                      DO  i = nxl, nxr
+                         DO  j = nys, nyn
+                            CALL get_variable( id_dynamic, 'init_soil_m', i, j,&
+                                               init_3d%msoil(0:init_3d%nzs-1,j,i) )
+                         ENDDO
                       ENDDO
-                   ENDDO
-                ENDIF
-                init_3d%from_file_msoil = .TRUE.
-             ENDIF
-!
-!--          Read soil temperature
-             IF ( check_existence( var_names, 'init_soil_t' ) )  THEN
-!
-!--             Read attributes for the fill value and level-of-detail
-                CALL get_attribute( id_dynamic, char_fill, init_3d%fill_tsoil, &
-                                    .FALSE., 'init_soil_t' )
-                CALL get_attribute( id_dynamic, char_lod, init_3d%lod_tsoil,   &
-                                    .FALSE., 'init_soil_t' )
-!
-!--             level-of-detail 1 - read initialization profile
-                IF ( init_3d%lod_tsoil == 1 )  THEN
-                   ALLOCATE( init_3d%tsoil_init(0:init_3d%nzs-1) )
-
-                   CALL get_variable( id_dynamic, 'init_soil_t',               &
-                                      init_3d%tsoil_init(0:init_3d%nzs-1) )
-
-!
-!--             level-of-detail 2 - read 3D initialization data
-                ELSEIF ( init_3d%lod_tsoil == 2 )  THEN  ! need to be corrected
-                   ALLOCATE ( init_3d%tsoil(0:init_3d%nzs-1,nys:nyn,nxl:nxr) )
-                   DO  i = nxl, nxr
-                      DO  j = nys, nyn
-                         CALL get_variable( id_dynamic, 'init_soil_t', i, j,   &
-                                            init_3d%tsoil(0:init_3d%nzs-1,j,i) )
+                   ENDIF
+                   init_3d%from_file_msoil = .TRUE.
+                ENDIF
+!
+!--             Read soil temperature
+                IF ( check_existence( var_names, 'init_soil_t' ) )  THEN
+!
+!--                Read attributes for the fill value and level-of-detail
+                   CALL get_attribute( id_dynamic, char_fill,                  &
+                                       init_3d%fill_tsoil,                     &
+                                       .FALSE., 'init_soil_t' )
+                   CALL get_attribute( id_dynamic, char_lod,                   &
+                                       init_3d%lod_tsoil,                      &
+                                       .FALSE., 'init_soil_t' )
+!
+!--                level-of-detail 1 - read initialization profile
+                   IF ( init_3d%lod_tsoil == 1 )  THEN
+                      ALLOCATE( init_3d%tsoil_init(0:init_3d%nzs-1) )
+
+                      CALL get_variable( id_dynamic, 'init_soil_t',            &
+                                         init_3d%tsoil_init(0:init_3d%nzs-1) )
+
+!
+!--                level-of-detail 2 - read 3D initialization data
+                   ELSEIF ( init_3d%lod_tsoil == 2 )  THEN  ! need to be corrected
+                      ALLOCATE ( init_3d%tsoil(0:init_3d%nzs-1,nys:nyn,nxl:nxr) )
+                      DO  i = nxl, nxr
+                         DO  j = nys, nyn
+                            CALL get_variable( id_dynamic, 'init_soil_t', i, j,&
+                                               init_3d%tsoil(0:init_3d%nzs-1,j,i) )
+                         ENDDO
                       ENDDO
-                   ENDDO
-                ENDIF
-                init_3d%from_file_tsoil = .TRUE.
+                   ENDIF
+                   init_3d%from_file_tsoil = .TRUE.
+                ENDIF
              ENDIF
 !