--- MITgcm/model/src/packages_check.F	2000/09/11 20:42:57	1.2
+++ MITgcm/model/src/packages_check.F	2000/09/13 17:11:34	1.3
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/packages_check.F,v 1.2 2000/09/11 20:42:57 heimbach Exp $
+ $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/packages_check.F,v 1.3 2000/09/13 17:11:34 heimbach Exp $
 
 #include "CPP_OPTIONS.h"
 
@@ -23,42 +23,16 @@
 C     msgBuf      - Informational/error meesage buffer
       CHARACTER*(MAX_LEN_MBUF) msgBuf
 
-
-#ifndef ALLOW_KPP
-      IF (useKPP) THEN
-       WRITE(msgBuf,'(A)') '#define ALLOW_KPP to use useKPP'
-       CALL PRINT_ERROR( msgBuf , 1)
-       STOP 'ABNORMAL END: S/R PACKAGE_CHECK'
-      ENDIF
+#ifdef ALLOW_KPP
+      IF (useKPP) CALL KPP_CHECK( myThid )
 #else
-      WRITE(msgBuf,'(A)') 'PACKAGE_CHECK: #define ALLOW_KPP'
-      CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
-     &  SQUEEZE_RIGHT , 1)
-C     KPP needs convection turned off (will be packaged later)
-      IF (useKPP) THEN
-       IF (cAdjFreq.NE.0.  .OR.
-     &     ivdc_kappa.NE.0.) THEN
-        WRITE(msgBuf,'(A)') 'Some form of convection has been enabled'
-        CALL PRINT_ERROR( msgBuf , 1)
-        STOP 'ABNORMAL END: S/R PACKAGE_CHECK'
-       ENDIF
-       IF (.NOT.implicitDiffusion ) THEN
-        WRITE(msgBuf,'(A)') 'KPP needs implicitDiffusion to be enabled'
-        CALL PRINT_ERROR( msgBuf , 1)
-        STOP 'ABNORMAL END: S/R PACKAGE_CHECK'
-       ENDIF
-       IF (.NOT.implicitViscosity) THEN
-        WRITE(msgBuf,'(A)') 'KPP needs implicitViscosity to be enabled'
-        CALL PRINT_ERROR( msgBuf , 1)
-        STOP 'ABNORMAL END: S/R PACKAGE_CHECK'
-       ENDIF
-      ENDIF
+      IF (useKPP) CALL PACKAGES_CHECK_ERROR('KPP')
 #endif
 
-#ifndef ALLOW_GMREDI
-      IF (useGMRedi) CALL PACKAGES_CHECK_ERROR('GMREDI')
-#else
+#ifdef ALLOW_GMREDI
       IF (useGMRedi) CALL GMREDI_CHECK( myThid )
+#else
+      IF (useGMRedi) CALL PACKAGES_CHECK_ERROR('GMREDI')
 #endif
 
       return