Changeset 2232 for palm/trunk/SOURCE/write_3d_binary.f90

Timestamp:

May 30, 2017 5:47:52 PM (7 years ago)

Author:

suehring

Message:

Adjustments according new topography and surface-modelling concept implemented

File:

• palm/trunk/SOURCE/write_3d_binary.f90 (modified) (14 diffs)

palm/trunk/SOURCE/write_3d_binary.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Adjustments to new surface concept - move output of surface varariables
+! to surface_mod
 ! 
 ! Former revisions:
@@ -112 +113 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  e, kh, km, ol, p, pt, q, ql, qc, nr, nrs, nrsws, nrswst,        &
-               prr, precipitation_amount, qr,                                  &
-               qrs, qrsws, qrswst, qs, qsws, qswst, s, sa, ssws, sswst,        &
-               saswsb, saswst, rif_wall, shf, ss, ts, tswst, u, u_m_l, u_m_n,  &
-               u_m_r, u_m_s, us, usws, uswst, v, v_m_l, v_m_n, v_m_r, v_m_s,   &
-               vpt, vsws, vswst, w, w_m_l, w_m_n, w_m_r, w_m_s, z0, z0h, z0q
+        ONLY:  e, kh, km, p, pt, q, ql, qc, nr, prr, precipitation_amount, qr, &
+               s, sa, u, u_m_l, u_m_n, u_m_r, u_m_s, v, v_m_l, v_m_n, v_m_r,   &
+               v_m_s, vpt, w, w_m_l, w_m_n, w_m_r, w_m_s
         
     USE averaging
@@ -142 +140 @@
         ONLY:  spectrum_x, spectrum_y
 
+    USE surface_mod,                                                           &
+        ONLY :  surface_write_restart_data
+
+
     IMPLICIT NONE
 
     CHARACTER (LEN=10) ::  binary_version   !< 
-
 
 !
@@ -164 +165 @@
 !--            Also, the list of arrays to be read in read_3d_binary must be
 !--            adjusted accordingly.
-
     WRITE ( 14 )  'e                   ';  WRITE ( 14 )  e
     IF ( ALLOCATED( e_av ) )  THEN
@@ -178 +178 @@
        WRITE ( 14 )  'lwp_av              ';  WRITE ( 14 )  lwp_av
     ENDIF
-    WRITE ( 14 )  'ol                  ';  WRITE ( 14 )  ol
     WRITE ( 14 )  'p                   ';  WRITE ( 14 )  p
     IF ( ALLOCATED( p_av ) )  THEN
@@ -226 +225 @@
                    WRITE ( 14 )  'nr_av               ';  WRITE ( 14 )  nr_av
                 ENDIF
-                WRITE ( 14 )  'nrs                 ';  WRITE ( 14 )  nrs
-                WRITE ( 14 )  'nrsws               ';  WRITE ( 14 )  nrsws
-                WRITE ( 14 )  'nrswst              ';  WRITE ( 14 )  nrswst
                 WRITE ( 14 )  'qr                  ';  WRITE ( 14 )  qr
                 IF ( ALLOCATED( qr_av ) )  THEN
                    WRITE ( 14 )  'qr_av               ';  WRITE ( 14 )  qr_av
                 ENDIF
-                WRITE ( 14 )  'qrs                 ';  WRITE ( 14 )  qrs
-                WRITE ( 14 )  'qrsws               ';  WRITE ( 14 )  qrsws
-                WRITE ( 14 )  'qrswst              ';  WRITE ( 14 )  qrswst
              ENDIF
           ENDIF
        ENDIF
-       WRITE ( 14 )  'qs                  ';  WRITE ( 14 )  qs
-       WRITE ( 14 )  'qsws                ';  WRITE ( 14 )  qsws
        IF ( ALLOCATED( qsws_av ) )  THEN
           WRITE ( 14 )  'qsws_av             ';  WRITE ( 14 )  qsws_av
        ENDIF
-       WRITE ( 14 )  'qswst               ';  WRITE ( 14 ) qswst
     ENDIF
     IF ( passive_scalar )  THEN
@@ -251 +241 @@
           WRITE ( 14 )  's_av                ';  WRITE ( 14 )  s_av
        ENDIF
-       WRITE ( 14 )  'ss                  ';  WRITE ( 14 )  ss
-       WRITE ( 14 )  'ssws                ';  WRITE ( 14 )  ssws
        IF ( ALLOCATED( ssws_av ) )  THEN
           WRITE ( 14 )  'ssws_av             ';  WRITE ( 14 )  ssws_av
        ENDIF
-       WRITE ( 14 )  'sswst               ';  WRITE ( 14 ) sswst
     ENDIF    
     IF ( ocean )  THEN
@@ -266 +253 @@
           WRITE ( 14 )  'sa_av               ';  WRITE ( 14 )  sa_av
        ENDIF
-       WRITE ( 14 )  'saswsb              ';  WRITE ( 14 )  saswsb
-       WRITE ( 14 )  'saswst              ';  WRITE ( 14 )  saswst
     ENDIF
     IF ( ALLOCATED( ql_c_av ) )  THEN
@@ -287 +272 @@
                                            WRITE ( 14 )  seq_random_array
     ENDIF
-    IF ( topography /= 'flat' )  THEN
-       WRITE ( 14 )  'rif_wall            ';  WRITE ( 14 )  rif_wall
-    ENDIF
     IF ( ALLOCATED( s_av ) )  THEN
        WRITE ( 14 )  's_av                ';  WRITE ( 14 )  s_av
     ENDIF
-    WRITE ( 14 )  'shf                 ';  WRITE ( 14 )  shf
     IF ( ALLOCATED( shf_av ) )  THEN
        WRITE ( 14 )  'shf_av              ';  WRITE ( 14 )  shf_av
@@ -301 +282 @@
        WRITE ( 14 )  'spectrum_y          ';  WRITE ( 14 )  spectrum_y
     ENDIF
-    WRITE ( 14 )  'ts                  ';  WRITE ( 14 )  ts
     IF ( ALLOCATED( ts_av ) )  THEN
        WRITE ( 14 )  'ts_av               ';  WRITE ( 14 )  ts_av
     ENDIF
-    WRITE ( 14 )  'tswst               ';  WRITE ( 14 )  tswst
     WRITE ( 14 )  'u                   ';  WRITE ( 14 )  u
     IF ( ALLOCATED( u_av ) )  THEN
@@ -322 +301 @@
        WRITE ( 14 )  'u_m_s               ';  WRITE ( 14 )  u_m_s
     ENDIF
-    WRITE ( 14 )  'us                  ';  WRITE ( 14 )  us
-    WRITE ( 14 )  'usws                ';  WRITE ( 14 )  usws
-    WRITE ( 14 )  'uswst               ';  WRITE ( 14 )  uswst
     IF ( ALLOCATED( us_av ) )  THEN
        WRITE ( 14 )  'us_av               ';  WRITE ( 14 )  us_av
@@ -350 +326 @@
        ENDIF
     ENDIF
-    WRITE ( 14 )  'vsws                ';  WRITE ( 14 )  vsws
-    WRITE ( 14 )  'vswst               ';  WRITE ( 14 )  vswst
     WRITE ( 14 )  'w                   ';  WRITE ( 14 )  w
     IF ( ALLOCATED( w_av ) )  THEN
@@ -368 +342 @@
        WRITE ( 14 )  'w_m_s               ';  WRITE ( 14 )  w_m_s
     ENDIF
-    WRITE ( 14 )  'z0                  ';  WRITE ( 14 )  z0
     IF ( ALLOCATED( z0_av ) )  THEN
        WRITE ( 14 )  'z0_av               ';  WRITE ( 14 )  z0_av
     ENDIF
-    WRITE ( 14 )  'z0h                 ';  WRITE ( 14 )  z0h
     IF ( ALLOCATED( z0h_av ) )  THEN
        WRITE ( 14 )  'z0h_av              ';  WRITE ( 14 )  z0h_av
     ENDIF
-    WRITE ( 14 )  'z0q                 ';  WRITE ( 14 )  z0q
     IF ( ALLOCATED( z0q_av ) )  THEN
        WRITE ( 14 )  'z0q_av              ';  WRITE ( 14 )  z0q_av
@@ -385 +356 @@
     WRITE ( 14 )  '*** end ***         '
 
+    CALL surface_write_restart_data
+
  END SUBROUTINE write_3d_binary