--- MITgcm/model/src/packages_check.F 2008/08/17 02:08:24 1.44 +++ MITgcm/model/src/packages_check.F 2009/09/16 21:36:11 1.46 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/packages_check.F,v 1.44 2008/08/17 02:08:24 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/packages_check.F,v 1.46 2009/09/16 21:36:11 rpa Exp $ C $Name: $ #include "PACKAGES_CONFIG.h" @@ -280,6 +280,12 @@ IF (useREGRID) CALL PACKAGES_ERROR_MSG('REGRID',' ',myThid) #endif +#ifdef ALLOW_LAYERS + IF ( useLayers ) CALL LAYERS_CHECK( myThid ) +#else + IF ( useLayers ) CALL PACKAGES_ERROR_MSG('LAYERS',' ',myThid) +#endif /* ALLOW_LAYERS */ + #ifdef ALLOW_MYPACKAGE IF (useMYPACKAGE) CALL MYPACKAGE_CHECK( myThid ) #else @@ -292,6 +298,10 @@ IF (useSALT_PLUME)CALL PACKAGES_ERROR_MSG('SALT_PLUME',' ',myThid) #endif +#ifdef ALLOW_ECCO + CALL ECCO_CHECK( myThid ) +#endif + C--- Exclusive packages (which cannot be used together): IF ( useEXF .AND. useBulkForce ) THEN WRITE(msgBuf,'(2A)') 'PACKAGES_CHECK: ',