--- MITgcm/model/src/packages_init_fixed.F	2004/02/12 16:01:32	1.18
+++ MITgcm/model/src/packages_init_fixed.F	2005/02/15 01:54:53	1.36
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/packages_init_fixed.F,v 1.18 2004/02/12 16:01:32 molod Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/packages_init_fixed.F,v 1.36 2005/02/15 01:54:53 jmc Exp $
 C $Name:  $
 
 #include "PACKAGES_CONFIG.h"
@@ -19,17 +19,50 @@
 C     !CALLING SEQUENCE:
 C     PACKAGES_INIT_FIXED
 C       |
+C       |-- DIAGNOSTICS_INIT_EARLY
+C       |-- DIAGNOSTICS_MAIN_INIT
+C       |
 C       |-- GAD_INIT
 C       |
+C       |-- CD_CODE_INIT_FIXED
+C       |
+C       |-- GMREDI_INIT_FIXED
+C       |
+C       |-- OPPS_INIT
+C       |
 C       |-- OBCS_INIT_FIXED
 C       |
 C       |-- FLT_INIT
 C       |
+C       |-- TIMEAVE_INIT_FIXED
+C       |
+C       |-- SHAP_FILT_INIT_FIZED
+C       |
 C       |-- ZONAL_FILT_INIT
 C       |
+C       |-- ATM_DIAGNOSTICS_INIT
+C       |
 C       |-- AIM_INITIALISE
 C       |
+C       |-- GRIDALT_INITIALISE
+C       |
+C       |-- FIZHI_INIT_FIXED
+C       |
 C       |-- LAND_INITIALISE
+C       |
+C       |-- ECCO_COST_INIT_FIXED
+C       |
+C       |-- CTRL_INIT
+C       |
+C       |-- PTRACERS_INITIALISE
+C       |
+C       |-- GCHEM_INIT_FIXED
+C       |
+C       |-- THSICE_INIT_FIXED
+C       |
+C       |-- CPL_INIT_FIXED
+C       |
+C       |-- DIAGNOSTICS_INIT_FIXED
 
 C     !USES:
       IMPLICIT NONE
@@ -44,8 +77,34 @@
       INTEGER myThid
 CEOP
 
+#ifdef ALLOW_DIAGNOSTICS
+      IF ( useDiagnostics ) THEN
+        CALL DIAGNOSTICS_INIT_EARLY( myThid )
+        CALL DIAGNOSTICS_MAIN_INIT( myThid )
+      ENDIF
+#endif
+
+#ifdef ALLOW_GENERIC_ADVDIFF
 C--   Initialize fixed params for GAD
       CALL GAD_INIT( myThid )
+#endif
+
+#ifdef ALLOW_CD_CODE
+      IF (useCDscheme) THEN
+       CALL CD_CODE_INIT_FIXED(mythid)
+      ENDIF
+#endif
+
+#ifdef ALLOW_GMREDI
+C--   Initialize fixed arrays for GM-Redi
+      IF ( useGMRedi ) THEN
+       CALL GMREDI_INIT_FIXED( myThid )
+      ENDIF
+#endif
+
+#ifdef ALLOW_OPPS
+      IF (useOPPS) CALL OPPS_INIT( myThid )
+#endif /* ALLOW_OPPS */
 
 C--   Initialize fixed arrays for OBCS
 #ifdef ALLOW_OBCS
@@ -53,6 +112,7 @@
        CALL OBCS_INIT_FIXED( myThid )
       ENDIF
 #endif
+
 #ifdef ALLOW_FLT
 C--   Initialise Float positions
       IF (useFLT) THEN
@@ -60,6 +120,21 @@
       _BARRIER
       ENDIF
 #endif
+
+#ifdef ALLOW_TIMEAVE
+C     IF (useTIMEAVE) THEN
+      IF ( taveFreq.GT.0. ) THEN
+       CALL TIMEAVE_INIT_FIXED( myThid )
+      ENDIF
+#endif
+
+#ifdef ALLOW_SHAP_FILT
+C--   Shapiro filter initialisation
+      IF (useSHAP_FILT) THEN
+       CALL SHAP_FILT_INIT_FIXED( myThid )
+      ENDIF
+#endif
+
 #ifdef ALLOW_ZONAL_FILT
 C--   Latitude circle filter initialisation
       IF (useZONAL_FILT) THEN
@@ -68,6 +143,13 @@
       ENDIF
 #endif
 
+#ifdef ALLOW_ATM_COMMON
+C--   Initialise parameters shared by atmospheric physics packages
+      IF ( (useAIM.OR.useFIZHI)  .AND. useDiagnostics ) THEN
+        CALL ATM_DIAGNOSTICS_INIT( myThid )
+      ENDIF
+#endif
+
 #ifdef ALLOW_AIM
 C--   Initialise & Read AIM physical parameters
       IF (useAIM) CALL AIM_INITIALISE( myThid )
@@ -76,7 +158,12 @@
 C AMM
 #ifdef ALLOW_GRIDALT
 C--   Initialise GRIDALT parameters - the alternative grid
-      IF (useGRIDALT) CALL GRIDALT_INITIALISE( myThid )
+      IF (useGRIDALT) then
+       CALL TIMER_START('GRIDALT_INITIALISE  [PACKAGES_INIT_F]',mythid)
+       CALL GRIDALT_INITIALISE( myThid )
+       CALL TIMER_STOP ('GRIDALT_INITIALISE  [PACKAGES_INIT_F]',mythid)
+      ENDIF
+
 #endif
 
 #ifdef ALLOW_FIZHI
@@ -104,20 +191,26 @@
 #endif
 
 #ifdef ALLOW_PTRACERS
+      IF (usePTRACERS) CALL PTRACERS_INITIALISE(mythid)
+#endif
+
 #ifdef ALLOW_GCHEM
-      IF (usePTRACERS) then
-       call GCHEM_INIT_FIXED(mythid)
-      ENDIF
+      IF (useGCHEM) CALL GCHEM_INIT_FIXED(mythid)
 #endif
+
+#ifdef ALLOW_THSICE
+      IF (useThSIce) CALL THSICE_INIT_FIXED(mythid)
+#endif
+
+#ifdef COMPONENT_MODULE
+      IF ( useCoupler ) CALL CPL_INIT_FIXED( mythid )
 #endif
 
-CAMM
 #ifdef ALLOW_DIAGNOSTICS
-      IF (usediagnostics) then
-       call diagnostics_init(mythid)
+      IF ( useDiagnostics ) THEN
+        CALL DIAGNOSTICS_INIT_FIXED( myThid )
       ENDIF
 #endif
-CAMM
 
       RETURN
       END