Changeset 1757 for palm

Timestamp:

Feb 22, 2016 3:49:32 PM (9 years ago)

Author:

maronga

Message:

some changes in land surface model, radiation model, nudging and some minor updates

Location:

palm/trunk

Files:

• LIB/rrtmg/install_rrtmg (modified) (1 diff)
• SCRIPTS/mrun (modified) (1 diff)
• SCRIPTS/palm_wd_files/wd.ui (modified) (3 diffs)
• SOURCE/check_parameters.f90 (modified) (1 diff)
• SOURCE/land_surface_model.f90 (modified) (8 diffs)
• SOURCE/nudging.f90 (modified) (3 diffs)
• SOURCE/package_parin.f90 (modified) (3 diffs)
• SOURCE/radiation_model.f90 (modified) (4 diffs)
• SOURCE/read_3d_binary.f90 (modified) (3 diffs)
• SOURCE/surface_layer_fluxes.f90 (modified) (4 diffs)

palm/trunk/LIB/rrtmg/install_rrtmg

@@ -53 +53 @@
 #
 
- compiler_name="ftn"
- fopts="-em -s real64 -O3 -hnoomp -hfp3 -hdynamic"
- fopts_trace="-eD -em -g -R b -K trap=fp -O0 -hnoomp -fpic"
+ compiler_name="mpif90"
+ fopts="-fltconsistency -O3 -cpp -r8 -nbs -convert little_endian -I /muksoft/packages/netcdf/4_intel/include"
+ fopts_trace="-fpe0 -C -check nooutput_conversion -debug -traceback -g -w -xT -O0 -ftz -fno-alias -no-prec-div -no-prec-sqrt -ip -nbs -convert little_endian -diag-disable 8290,8291 -I /muksoft/packages/netcdf/4_intel/include"
  install_path="$HOME/rrtmg"
  compile_static=false
- compile_shared=true
- compile_static_debug=false
+ compile_shared=false
+ compile_static_debug=true
  compile_shared_debug=true
 

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# Bugfix: use random number when PBS system is not working properly at lccray*
 # 
 # Former revisions:

palm/trunk/SCRIPTS/palm_wd_files/wd.ui

@@ -622 +622 @@
    <hints>
     <hint type="sourcelabel">
-     <x>405</x>
-     <y>135</y>
+     <x>491</x>
+     <y>172</y>
     </hint>
     <hint type="destinationlabel">
@@ -638 +638 @@
    <hints>
     <hint type="sourcelabel">
-     <x>554</x>
-     <y>142</y>
+     <x>615</x>
+     <y>172</y>
     </hint>
     <hint type="destinationlabel">
@@ -654 +654 @@
    <hints>
     <hint type="sourcelabel">
-     <x>710</x>
-     <y>140</y>
+     <x>739</x>
+     <y>172</y>
     </hint>
     <hint type="destinationlabel">
      <x>656</x>
      <y>150</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionOptions</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>Options()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>398</x>
+     <y>98</y>
     </hint>
    </hints>

palm/trunk/SOURCE/check_parameters.f90

@@ -4284 +4284 @@
 !
 !-- Check nudging and large scale forcing from external file
-    IF ( nudging .AND. ( .NOT. large_scale_forcing ) )  THEN
-       message_string = 'Nudging requires large_scale_forcing = .T.. &'//      &
-                        'Surface fluxes and geostrophic wind should be &'//    &
-                        'prescribed in file LSF_DATA'
-       CALL message( 'check_parameters', 'PA0374', 1, 2, 0, 6, 0 )
-    ENDIF
+!!!    IF ( nudging .AND. ( .NOT. large_scale_forcing ) )  THEN
+!!!       message_string = 'Nudging requires large_scale_forcing = .T.. &'//      &
+!!!                        'Surface fluxes and geostrophic wind should be &'//    &
+!!!                        'prescribed in file LSF_DATA'
+!!!       CALL message( 'check_parameters', 'PA0374', 1, 2, 0, 6, 0 )
+!!    ENDIF
 
     IF ( large_scale_forcing .AND. ( bc_lr /= 'cyclic'  .OR.                   &

palm/trunk/SOURCE/land_surface_model.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: set tm_soil_m to zero after allocation. Added parameter 
+! unscheduled_radiation_calls to control calls of the radiation model based on
+! the skin temperature change during one time step (preliminary version). Set 
+! qsws_soil_eb to zero at model start (previously set to qsws_eb). Removed MAX
+! function as it cannot be vectorized.
 ! 
 ! Former revisions:
@@ -132 +136 @@
     USE radiation_model_mod,                                                   &
         ONLY:  force_radiation_call, radiation_scheme, rad_net, rad_sw_in,     &
-               rad_lw_out, rad_lw_out_change_0, sigma_sb
+               rad_lw_out, rad_lw_out_change_0, sigma_sb,                      &
+               unscheduled_radiation_calls
         
 #if defined ( __rrtmg )
@@ -320 +325 @@
 
     REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::                                 &
-              tt_soil_m, & !< t_soil storage array 
-              tm_soil_m, & !< m_soil storage array 
+              tt_soil_m, & !< t_soil storage array
+              tm_soil_m, & !< m_soil storage array
               root_fr      !< root fraction (sum=1) 
 
@@ -668 +673 @@
        tt_surface_m = 0.0_wp
        tt_soil_m    = 0.0_wp
+       tm_soil_m    = 0.0_wp
        tm_liq_eb_m  = 0.0_wp
        c_liq        = 0.0_wp
@@ -681 +687 @@
 
        qsws_liq_eb  = 0.0_wp
-       qsws_soil_eb = qsws_eb
+       qsws_soil_eb = 0.0_wp
        qsws_veg_eb  = 0.0_wp
 
@@ -1235 +1241 @@
 
 !
-!--          In case of fast changes in the skin temperature, it is required to
-!--          update the radiative fluxes in order to keep the solution stable
-             IF ( ABS( t_surface_p(j,i) - t_surface(j,i) ) > 0.2_wp )  THEN
+!--          In case of fast changes in the skin temperature, it is possible to
+!--          update the radiative fluxes independently from the prescribed
+!--          radiation call frequency. This effectively prevents oscillations,
+!--          especially when setting skip_time_do_radiation /= 0. The threshold
+!--          value of 0.2 used here is just a first guess. This method should be
+!--          revised in the future as tests have shown that the threshold is 
+!--          often reached, when no oscillations would occur (causes immense
+!--          computing time for the radiation code).
+             IF ( ABS( t_surface_p(j,i) - t_surface(j,i) ) > 0.2_wp .AND.      &
+                  unscheduled_radiation_calls )  THEN
                 force_radiation_call_l = .TRUE.
              ENDIF
@@ -1388 +1401 @@
 !
 !--    Make a logical OR for all processes. Force radiation call if at
-!--    least one processor
-       IF ( intermediate_timestep_count == intermediate_timestep_count_max-1 ) &
-       THEN
+!--    least one processor reached the threshold change in skin temperature
+       IF ( unscheduled_radiation_calls .AND. intermediate_timestep_count      &
+            == intermediate_timestep_count_max-1 )  THEN
 #if defined( __parallel )
           IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
@@ -1628 +1641 @@
 !
 !--             Account for dry soils (find a better solution here!)
-                m_soil_p(:,j,i) = MAX(m_soil_p(:,j,i),0.0_wp)
+                DO  k = nzb_soil, nzt_soil
+                   IF ( m_soil_p(k,j,i) < 0.0_wp )  m_soil_p(k,j,i) = 0.0_wp
+                ENDDO
+
+
+
 
 !

palm/trunk/SOURCE/nudging.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix: allow for using higher vertical resolution in nudging file than grid
+! spacing in the LES model
 ! 
 ! Former revisions:
@@ -208 +209 @@
 
           DO  k = nzb, nzt+1
-             IF ( highheight < zu(k) )  THEN
+             DO WHILE ( highheight < zu(k) )
                 lowheight  = highheight
                 lowtnudge  = hightnudge
@@ -229 +230 @@
                    CALL message( 'nudging', 'PA0364', 1, 2, 0, 6, 0 )
                 ENDIF
-             ENDIF
+             ENDDO
 
 !

palm/trunk/SOURCE/package_parin.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added parameter unscheduled_radiation_calls
 ! 
 ! Former revisions:
@@ -161 +161 @@
               emissivity, lambda, lw_radiation, net_radiation, radiation,      &
               radiation_scheme, skip_time_do_radiation, sw_radiation,          &
-              time_utc_init
+              time_utc_init, unscheduled_radiation_calls
                 
 
@@ -242 +242 @@
                                   lambda, lw_radiation, net_radiation,         &
                                   radiation_scheme, skip_time_do_radiation,    &
-                                  sw_radiation, time_utc_init 
+                                  sw_radiation, time_utc_init,                 &
+                                  unscheduled_radiation_calls
 
     NAMELIST /spectra_par/        averaging_interval_sp, comp_spectra_level,   &

palm/trunk/SOURCE/radiation_model.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added parameter unscheduled_radiation_calls. Bugfix: interpolation of sounding
+! profiles for pressure and temperature above the LES domain.
 ! 
 ! Former revisions:
@@ -164 +165 @@
 
 
-    LOGICAL ::  constant_albedo = .FALSE.,       & !< flag parameter indicating whether the albedo may change depending on zenith
-                force_radiation_call = .FALSE.,  & !< flag parameter for unscheduled radiation calls
-                lw_radiation = .TRUE.,           & !< flag parameter indicing whether longwave radiation shall be calculated
-                radiation = .FALSE.,             & !< flag parameter indicating whether the radiation model is used
-                sun_up    = .TRUE.,              & !< flag parameter indicating whether the sun is up or down
-                sw_radiation = .TRUE.              !< flag parameter indicing whether shortwave radiation shall be calculated
+    LOGICAL ::  unscheduled_radiation_calls = .TRUE., & !< flag parameter indicating whether additional calls of the radiation code are allowed
+                constant_albedo = .FALSE.,            & !< flag parameter indicating whether the albedo may change depending on zenith
+                force_radiation_call = .FALSE.,       & !< flag parameter for unscheduled radiation calls
+                lw_radiation = .TRUE.,                & !< flag parameter indicating whether longwave radiation shall be calculated
+                radiation = .FALSE.,                  & !< flag parameter indicating whether the radiation model is used
+                sun_up    = .TRUE.,                   & !< flag parameter indicating whether the sun is up or down
+                sw_radiation = .TRUE.                   !< flag parameter indicing whether shortwave radiation shall be calculated
 
 
@@ -372 +374 @@
            rad_sw_out_av, rad_sw_cs_hr, rad_sw_cs_hr_av, rad_sw_hr,            &
            rad_sw_hr_av, sigma_sb, skip_time_do_radiation, sw_radiation,       &
-           time_radiation, time_utc_init
+           time_radiation, time_utc_init, unscheduled_radiation_calls
 
 
@@ -1229 +1231 @@
        q_snd = 0.0_wp
 
-       hyp_snd(nzt+2:nzt_rad) = hyp_snd_tmp(nz_snd_start:nz_snd_end)
-       t_snd(nzt+2:nzt_rad)   = t_snd_tmp(nz_snd_start:nz_snd_end)
-
-       DEALLOCATE ( hyp_snd_tmp )
-       DEALLOCATE ( t_snd_tmp )
+       hyp_snd(nzt+2:nzt_rad) = hyp_snd_tmp(nz_snd_start+1:nz_snd_end)
+       t_snd(nzt+2:nzt_rad)   = t_snd_tmp(nz_snd_start+1:nz_snd_end)
 
        nc_stat = NF90_CLOSE( id )

palm/trunk/SOURCE/read_3d_binary.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix in allocation of radiative heating rates
 ! 
 ! Former revisions:
@@ -898 +898 @@
 
                 CASE ( 'rad_lw_cs_hr_av' )
-                   IF ( .NOT. ALLOCATED( rad_lw_out_av ) )  THEN
+                   IF ( .NOT. ALLOCATED( rad_lw_cs_hr_av ) )  THEN
                       ALLOCATE( rad_lw_cs_hr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
                    ENDIF
@@ -962 +962 @@
 
                 CASE ( 'rad_sw_cs_hr_av' )
-                   IF ( .NOT. ALLOCATED( rad_sw_out_av ) )  THEN
+                   IF ( .NOT. ALLOCATED( rad_sw_cs_hr_av ) )  THEN
                       ALLOCATE( rad_sw_cs_hr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
                    ENDIF

palm/trunk/SOURCE/surface_layer_fluxes.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! Minor fixes.
 !
 ! Former revisions:
@@ -358 +358 @@
 
 !
-!--       Invert array and switch sign, then calculate Obukhov length and bulk
-!--       Richardson number
-          z0h_min = MINVAL(z0h)
-          z0_min  = MINVAL(z0)
+!--       Save roughness lengths to temporary variables
+          z0h_min = z0h(nys,nxl)
+          z0_min  = z0(nys,nxl)
           
 !
@@ -641 +640 @@
              DO  j = nys, nyn
 
-                k   = nzb_s_inner(j,i)
-
 !
 !--             If the bulk Richardson number is outside the range of the lookup
@@ -1055 +1052 @@
              !$acc loop independent
              DO  j = nysg, nyng
-                e(nzb_s_inner(j,i)+1,j,i) = ( us(j,i) / 0.1_wp )**2
+                k = nzb_s_inner(j,i)
+                e(k+1,j,i) = ( us(j,i) / 0.1_wp )**2
 !
 !--             As a test: cm = 0.4
-!               e(nzb_s_inner(j,i)+1,j,i) = ( us(j,i) / 0.4_wp )**2
-                e(nzb_s_inner(j,i),j,i)   = e(nzb_s_inner(j,i)+1,j,i)
+!               e(k+1,j,i) = ( us(j,i) / 0.4_wp )**2
+                e(k,j,i)   = e(k+1,j,i)
              ENDDO
           ENDDO