Changeset 1327 for palm/trunk/SOURCE/header.f90

Timestamp:

Mar 21, 2014 11:00:16 AM (10 years ago)

Author:

raasch

Message:

Changed:

---

-s real64 removed (.mrun.config.hlrnIII)
-r8 removed (.mrun.config.imuk)
deleted: .mrun.config.imuk_ice2_netcdf4 .mrun.config.imuk_hlrn

REAL constants defined as wp-kind in modules

"baroclinicity" renamed "baroclinity", "ocean version" replaced by
"ocean mode"

code parts concerning old output formats "iso2d" and "avs" removed.
netCDF is the only remaining output format.

Errors:

---

bugfix: duplicate error message 56 removed

File:

• palm/trunk/SOURCE/header.f90 (modified) (11 diffs)

palm/trunk/SOURCE/header.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
+! parts concerning iso2d and avs output removed,
+! -netcdf output queries
 !
 ! Former revisions:
@@ -815 +817 @@
 
        output_format = ''
-       IF ( netcdf_output )  THEN
-          output_format = output_format_netcdf
-       ENDIF
+       output_format = output_format_netcdf
        WRITE ( io, 344 )  output_format
 
@@ -866 +866 @@
        IF ( ( ( do2d_xy /= ''  .AND.  section(1,1) /= -9999 )  .OR.    &
               ( do2d_xz /= ''  .AND.  section(1,2) /= -9999 )  .OR.    &
-              ( do2d_yz /= ''  .AND.  section(1,3) /= -9999 ) )  .AND. &
-            ( netcdf_output  .OR.  iso2d_output ) )  THEN
+              ( do2d_yz /= ''  .AND.  section(1,3) /= -9999 ) ) )  THEN
 
           IF (  av == 0 )  THEN
@@ -882 +881 @@
 
           output_format = ''
-          IF ( netcdf_output )  THEN
-             output_format = output_format_netcdf
-          ENDIF
-          IF ( iso2d_output )  THEN
-             IF ( netcdf_output )  THEN
-                output_format = TRIM( output_format_netcdf ) // ' and iso2d'
-             ELSE
-                output_format = 'iso2d'
-             ENDIF
-          ENDIF
+          output_format = output_format_netcdf
           WRITE ( io, 344 )  output_format
 
@@ -1048 +1038 @@
           ENDIF
 
-          output_format = ''
-          IF ( netcdf_output )  THEN
-             output_format = output_format_netcdf
-          ENDIF
-          IF ( avs_output )  THEN
-             IF ( netcdf_output )  THEN
-                output_format = TRIM( output_format_netcdf ) // ' and avs'
-             ELSE
-                output_format = 'avs'
-             ENDIF
-          ENDIF
+          output_format = output_format_netcdf
           WRITE ( io, 344 )  output_format
 
@@ -1079 +1059 @@
           ELSE
              WRITE ( io, 353 )
-          ENDIF
-
-          IF ( do3d_compress )  THEN
-             do3d_chr = ''
-             i = 1
-             DO WHILE ( do3d(av,i) /= ' ' )
-
-                SELECT CASE ( do3d(av,i) )
-                   CASE ( 'u' )
-                      j = 1
-                   CASE ( 'v' )
-                      j = 2
-                   CASE ( 'w' )
-                      j = 3
-                   CASE ( 'p' )
-                      j = 4
-                   CASE ( 'pt' )
-                      j = 5
-                END SELECT
-                WRITE ( prec, '(I1)' )  plot_3d_precision(j)%precision
-                do3d_chr = TRIM( do3d_chr ) // ' ' // TRIM( do3d(av,i) ) // &
-                           ':' // prec // ','
-                i = i + 1
-
-             ENDDO
-             WRITE ( io, 338 )  do3d_chr
-
           ENDIF
 
@@ -1144 +1097 @@
              ENDIF
 
-             output_format = ' '
-             IF ( netcdf_output )  THEN
-                output_format = output_format_netcdf
-             ENDIF
+             output_format = output_format_netcdf
 !--          Parallel output not implemented for mask data, hence
 !--          output_format must be adjusted.
@@ -1202 +1152 @@
        WRITE ( io, 340 )
 
-       output_format = ''
-       IF ( netcdf_output )  THEN
-          output_format = output_format_netcdf
-       ENDIF
+       output_format = output_format_netcdf
        WRITE ( io, 344 )  output_format
        WRITE ( io, 341 )  dt_dots
@@ -1268 +1215 @@
        WRITE ( io, 370 )
 
-       output_format = ' '
-       IF ( netcdf_output )  THEN
-          output_format = output_format_netcdf
-       ENDIF
+       output_format = output_format_netcdf
        WRITE ( io, 344 )  output_format
        WRITE ( io, 371 )  dt_dosp
@@ -1640 +1584 @@
        IF ( dt_write_particle_data /= 9999999.9_wp )  THEN
           WRITE ( io, 485 )  dt_write_particle_data
-          output_format = ' '
-          IF ( netcdf_output )  THEN
-             IF ( netcdf_data_format > 1 )  THEN
-                output_format = 'netcdf (64 bit offset) and binary'
-             ELSE
-                output_format = 'netcdf and binary'
-             ENDIF
+          IF ( netcdf_data_format > 1 )  THEN
+             output_format = 'netcdf (64 bit offset) and binary'
           ELSE
-             output_format = 'binary'
+             output_format = 'netcdf and binary'
           ENDIF
           WRITE ( io, 344 )  output_format
@@ -1905 +1844 @@
             '       Output every             ',F8.2,' s  ',A/ &
             '       Upper output limit at    ',F8.2,' m  (GP ',I4,')'/)
-338 FORMAT ('       Compressed data output'/ &
-            '       Decimal precision: ',A/)
 339 FORMAT ('       No output during initial ',F8.2,' s')
 340 FORMAT (/'    Time series:')