/[MITgcm]/MITgcm/model/src/ini_salt.F
ViewVC logotype

Diff of /MITgcm/model/src/ini_salt.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.17 by cnh, Tue Nov 8 23:01:10 2005 UTC revision 1.18 by edhill, Sun Nov 5 18:36:06 2006 UTC
# Line 32  C     === Global variables === Line 32  C     === Global variables ===
32  #include "PARAMS.h"  #include "PARAMS.h"
33  #include "GRID.h"  #include "GRID.h"
34  #include "DYNVARS.h"  #include "DYNVARS.h"
35    #ifdef ALLOW_MNC
36    #include "MNC_PARAMS.h"
37    #endif
38    
39  C     !INPUT/OUTPUT PARAMETERS:  C     !INPUT/OUTPUT PARAMETERS:
40  C     == Routine arguments ==  C     == Routine arguments ==
# Line 62  C--   Initialise salinity field to the v Line 65  C--   Initialise salinity field to the v
65        _BARRIER        _BARRIER
66    
67        IF ( hydrogSaltFile .NE. ' ' ) THEN        IF ( hydrogSaltFile .NE. ' ' ) THEN
68  C      _BEGIN_MASTER( myThid )  #ifdef ALLOW_MNC
69         CALL READ_FLD_XYZ_RL( hydrogSaltFile, ' ', salt, 0, myThid )          IF (useMNC .AND. mnc_read_salt) THEN
70  C      _END_MASTER(myThid)            CALL MNC_FILE_CLOSE_ALL_MATCHING(hydrogSaltFile, myThid)
71              CALL MNC_CW_SET_UDIM(hydrogSaltFile, 1, myThid)
72              CALL MNC_CW_SET_CITER(hydrogSaltFile, 2, -1, -1, -1, myThid)
73              CALL MNC_CW_SET_UDIM(hydrogSaltFile, 1, myThid)
74              CALL MNC_CW_RL_R('D',hydrogSaltFile,0,0,'S',salt, myThid)
75              CALL MNC_FILE_CLOSE_ALL_MATCHING(hydrogSaltFile, myThid)
76            ELSE
77    #endif /*  ALLOW_MNC  */
78    C        _BEGIN_MASTER( myThid )
79             CALL READ_FLD_XYZ_RL( hydrogSaltFile, ' ', salt, 0, myThid )
80    C        _END_MASTER(myThid)
81    #ifdef ALLOW_MNC
82            ENDIF
83    #endif /*  ALLOW_MNC  */
84         _EXCH_XYZ_R8(salt  , myThid )         _EXCH_XYZ_R8(salt  , myThid )
85        ENDIF        ENDIF
86    
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18
  ViewVC Help
Powered by ViewVC 1.1.22