/[MITgcm]/MITgcm/pkg/ctrl/ctrl_init_ctrlvar.F
ViewVC logotype

Diff of /MITgcm/pkg/ctrl/ctrl_init_ctrlvar.F

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

revision 1.3 by heimbach, Thu Nov 11 06:28:33 2004 UTC revision 1.4 by heimbach, Tue Nov 16 05:42:12 2004 UTC
# Line 1  Line 1 
 C  
1  C $Header$  C $Header$
2  C $Name$  C $Name$
3    
# Line 38  c     == global variables == Line 37  c     == global variables ==
37  #include "PARAMS.h"  #include "PARAMS.h"
38  #include "GRID.h"  #include "GRID.h"
39  #include "ctrl.h"  #include "ctrl.h"
40    #include "optim.h"
 #ifdef ALLOW_ECCO_OPTIMIZATION  
 # include "optim.h"  
 #endif  
41    
42  c     == routine arguments ==  c     == routine arguments ==
43        character*(MAX_LEN_FNAM) xx_fname        character*(MAX_LEN_FNAM) xx_fname
# Line 58  c     == routine arguments == Line 54  c     == routine arguments ==
54        integer mythid        integer mythid
55    
56  c     == local variables ==  c     == local variables ==
 #ifndef ALLOW_ECCO_OPTIMIZATION  
       integer optimcycle  
 #endif  
57        character*( 80) fname(2)        character*( 80) fname(2)
58        logical  exst        logical  exst
59    
 #ifndef ALLOW_ECCO_OPTIMIZATION  
       optimcycle = 0  
 #endif  
   
60        _BEGIN_MASTER( mythid )        _BEGIN_MASTER( mythid )
61    
62        ncvarindex(ivarindex)    = ncvarindex_loc        ncvarindex(ivarindex)    = ncvarindex_loc
# Line 85  c     == local variables == Line 74  c     == local variables ==
74        IF ( .NOT. exst) THEN        IF ( .NOT. exst) THEN
75    
76           if ( whichxyz .EQ. '3d') then           if ( whichxyz .EQ. '3d') then
77              call ctrl_set_globfld_xyz( fname(2), ivarindex, mythid)              if ( .NOT.doAdmTlm .OR. (doAdmTlm.AND.yadprefix.EQ.'ad') )
78         &           call ctrl_set_globfld_xyz( fname(2), ivarindex, mythid)
79              if ( doInitXX .AND. optimcycle.eq.0 )              if ( doInitXX .AND. optimcycle.eq.0 )
80       &           call ctrl_set_globfld_xyz( fname(1), ivarindex, mythid)       &           call ctrl_set_globfld_xyz( fname(1), ivarindex, mythid)
81           else if ( whichxyz .EQ. 'xy') then           else if ( whichxyz .EQ. 'xy') then
82              call ctrl_set_globfld_xy( fname(2), ivarindex, mythid)              if ( .NOT.doAdmTlm .OR. (doAdmTlm.AND.yadprefix.EQ.'ad') )
83         &           call ctrl_set_globfld_xy( fname(2), ivarindex, mythid)
84              if ( doInitXX .AND. optimcycle.eq.0 )              if ( doInitXX .AND. optimcycle.eq.0 )
85       &           call ctrl_set_globfld_xy( fname(1), ivarindex, mythid )       &           call ctrl_set_globfld_xy( fname(1), ivarindex, mythid )
86           else if ( whichxyz .EQ. 'xz') then           else if ( whichxyz .EQ. 'xz') then
87              call ctrl_set_globfld_xz( fname(2), ivarindex, mythid)              if ( .NOT.doAdmTlm .OR. (doAdmTlm.AND.yadprefix.EQ.'ad') )
88         &           call ctrl_set_globfld_xz( fname(2), ivarindex, mythid)
89              if ( doInitXX .AND. optimcycle.eq.0 )              if ( doInitXX .AND. optimcycle.eq.0 )
90       &           call ctrl_set_globfld_xz( fname(1), ivarindex, mythid )       &           call ctrl_set_globfld_xz( fname(1), ivarindex, mythid )
91           else if ( whichxyz .EQ. 'yz') then           else if ( whichxyz .EQ. 'yz') then
92              call ctrl_set_globfld_yz( fname(2), ivarindex, mythid)              if ( .NOT.doAdmTlm .OR. (doAdmTlm.AND.yadprefix.EQ.'ad') )
93         &           call ctrl_set_globfld_yz( fname(2), ivarindex, mythid)
94              if ( doInitXX .AND. optimcycle.eq.0 )              if ( doInitXX .AND. optimcycle.eq.0 )
95       &           call ctrl_set_globfld_yz( fname(1), ivarindex, mythid )       &           call ctrl_set_globfld_yz( fname(1), ivarindex, mythid )
96           else           else
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4
  ViewVC Help
Powered by ViewVC 1.1.22