Changeset 1606 for palm/trunk

Timestamp:

Jun 29, 2015 10:43:37 AM (9 years ago)

Author:

maronga

Message:

bugfix: compilation of radiation_model.f90 without netcdf

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• radiation_model.f90 (modified) (3 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added check for use of RRTMG without netCDF.
 ! 
 ! Former revisions:
@@ -1162 +1162 @@
           CALL message( 'check_parameters', 'PA0407', 1, 2, 0, 6, 0 )
 #endif
+#if defined ( __rrtmg ) && ! defined( __netcdf )
+          message_string = 'radiation_scheme = "rrtmg" requires ' //           & 
+                           'the use of NetCDF (preprocessor directive ' //     &
+                           '-D__netcdf'
+          CALL message( 'check_parameters', 'PA0412', 1, 2, 0, 6, 0 )
+#endif
+
        ENDIF
        IF ( albedo_type == 0 .AND. albedo == 9999999.9_wp .AND.                &

palm/trunk/SOURCE/radiation_model.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added preprocessor directive __netcdf to allow for compiling without netCDF.
+! Note, however, that RRTMG cannot be used without netCDF.
 ! 
 ! Former revisions:
@@ -81 +82 @@
     USE kinds
 
+#if defined ( __netcdf )
     USE netcdf
+#endif
 
     USE netcdf_control,                                                        &
@@ -896 +899 @@
     END SUBROUTINE calc_zenith
 
-#if defined ( __rrtmg )
+#if defined ( __rrtmg ) && defined ( __netcdf )
 !------------------------------------------------------------------------------!
 ! Description: