Changeset 1450

Timestamp:

Aug 21, 2014 7:31:51 AM (10 years ago)

Author:

heinze

Message:

bugfixes for large_scale forcing and nudging

Location:

palm/trunk

Files:

• SCRIPTS/subjob (modified) (2 diffs)
• SOURCE/flow_statistics.f90 (modified) (3 diffs)
• SOURCE/modules.f90 (modified) (2 diffs)

palm/trunk/SCRIPTS/subjob

@@ -23 +23 @@
 # Current revisions:
 # ------------------
-# 
+# HLRN-III (lccrayb): testq queue adjusted to mpp1testq
 # 
 # Former revisions:
@@ -344 +344 @@
         (ibmku)   queue=s4; remote_addres=133.5.4.129; submcom=/usr/local/bin/llsubmit;;
         (ibms)    queue=p_normal; remote_addres=150.183.5.101; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
-        (lccrayb) queue=testq; remote_addres=130.73.233.1; submcom=/opt/moab/7.2.6/bin/msub;;
+        (lccrayb) queue=mpp1testq; remote_addres=130.73.233.1; submcom=/opt/moab/7.2.6/bin/msub;;
         (lccrayh) queue=mpp1testq; remote_addres=130.75.4.1; submcom=/opt/moab/7.2.6/bin/msub;;
         (lccrayf) queue=small; remote_addres=86.50.166.21; submcom=/opt/slurm/default/bin/sbatch;;

palm/trunk/SOURCE/flow_statistics.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-! 
+! bugfix: calculate fac only for simulated_time >= 0.0
 !
 ! Former revisions:
@@ -1012 +1012 @@
 !--    Collect current large scale advection and subsidence tendencies for
 !--    data output
-       IF ( large_scale_forcing )  THEN
+       IF ( large_scale_forcing  .AND.  ( simulated_time .GT. 0.0_wp ) )  THEN
 !
 !--       Interpolation in time of LSF_DATA 
@@ -2768 +2768 @@
 !--    Collect current large scale advection and subsidence tendencies for
 !--    data output
-       IF ( large_scale_forcing )  THEN
+       IF ( large_scale_forcing  .AND.  ( simulated_time .GT. 0.0_wp ) )  THEN
 !
 !--       Interpolation in time of LSF_DATA 

palm/trunk/SOURCE/modules.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! ntnudge from 100 to 1000 increased to allow longer simulations
 ! 
 ! Former revisions:
@@ -576 +576 @@
                      maximum_parallel_io_streams = -1, max_pr_user = 0, &
                      mgcycles = 0, mg_cycles = -1, mg_switch_to_pe0_level = 0, mid, &
-                     nlsf = 1000, ntnudge = 100, netcdf_data_format = 2, ngsrb = 2, &
+                     nlsf = 1000, ntnudge = 1000, netcdf_data_format = 2, ngsrb = 2, &
                      nr_timesteps_this_run = 0, &
                      nsor = 20, nsor_ini = 100, n_sor, normalizing_region = 0, &