--- MITgcm/model/src/ini_fields.F	2000/04/05 17:52:37	1.6
+++ MITgcm/model/src/ini_fields.F	2005/04/06 18:29:53	1.20
@@ -1,42 +1,54 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/ini_fields.F,v 1.6 2000/04/05 17:52:37 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/ini_fields.F,v 1.20 2005/04/06 18:29:53 jmc Exp $
+C $Name:  $
 
+#include "PACKAGES_CONFIG.h"
 #include "CPP_OPTIONS.h"
 
-CStartOfInterface
+C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
+CBOP
+C     !ROUTINE: INI_FIELDS
+
+C     !INTERFACE:
       SUBROUTINE INI_FIELDS( myThid )
-C     /==========================================================\
-C     | SUBROUTINE INI_FIELDS                                    |
-C     | o Initialise model fields                                |
-C     |==========================================================|
-C     | Initial conditions of the model state variables are      |
-C     | set here. For continuation runs a restart file will be   |
-C     | used. For original runs custom rules can be included     |
-C     | here.                                                    |
-C     \==========================================================/
-      IMPLICIT NONE
 
-C     === Global variables ===
+C     !DESCRIPTION:
+C     Initial conditions of the model state variables are set here. For
+C     continuation runs a restart file will be used. For original runs
+C     custom rules can be included here.
+
+C     !USES:
+      IMPLICIT NONE
 #include "SIZE.h"
 #include "EEPARAMS.h"
 #include "PARAMS.h"
 
-C     == Routine arguments ==
-C     myThid -  Number of this instance of INI_FIELDS
+C     !INPUT PARAMETERS:
       INTEGER myThid
-CEndOfInterface
+CEOP
 
-C--   Set model variables to initial/restart conditions
-      IF ( startTime .EQ. 0. .AND.  nIter0 .EQ. 0 ) THEN
-       CALL INI_UVEL( myThid )
-       CALL INI_VVEL( myThid )
-       CALL INI_THETA( myThid )
-       CALL INI_SALT( myThid )
-       CALL INI_PSURF( myThid )
+C     Set model variables to initial/restart conditions
+      IF ( startTime .EQ. baseTime .AND.  nIter0 .EQ. 0
+     &     .AND. pickupSuff .EQ. ' ' ) THEN
+        CALL INI_VEL( myThid )
+        CALL INI_THETA( myThid )
+        CALL INI_SALT( myThid )
+        CALL INI_PSURF( myThid )
+        CALL INI_PRESSURE( myThid )
+#ifdef INCLUDE_EP_FORCING_CODE
+        CALL INI_EP( myThid )
+#endif
+        IF (nonHydrostatic) CALL INI_PNH( myThid )
       ELSE
-       IF ( nIter0 .EQ. 0 ) THEN
-        nIter0 = INT(startTime/deltaTClock )
-       ENDIF
-       CALL READ_CHECKPOINT( nIter0, myThid )
+c       IF ( nIter0 .EQ. 0 ) THEN
+c         nIter0 = INT(startTime/deltaTClock )
+c       ENDIF
+        CALL READ_CHECKPOINT( nIter0, myThid )
+
+CEH3        IF (pickup_write_immed) THEN
+CEH3          CALL WRITE_CHECKPOINT( 
+CEH3     &         .TRUE., myCurrentTime, myCurrentIter, myThid)
+CEH3        ENDIF
+
       ENDIF
 
       RETURN