/[MITgcm]/MITgcm/optim/optim_readdata.F
ViewVC logotype

Diff of /MITgcm/optim/optim_readdata.F

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

revision 1.10 by mlosch, Mon Jul 25 08:58:47 2011 UTC revision 1.13 by gforget, Tue Jun 2 14:49:13 2015 UTC
# Line 1  Line 1 
1    
2    c ECCO_CPPOPTIONS used to affect maxcvars
3    c and def ALLOW_OBCSN_CONTROL etc (OBCS masks etc)
4    c#include ECCO_CPPOPTIONS.h
5    
6    c CTRL_OPTIONS affects maxcvars and may def
7    c ALLOW_OBCSN_CONTROL etc (OBCS masks etc)
8    #include "CTRL_OPTIONS.h"
9    
10        subroutine optim_readdata(        subroutine optim_readdata(
11       I                      nn,       I                      nn,
12       I                      dfile,       I                      dfile,
# Line 33  c     == global variables == Line 41  c     == global variables ==
41    
42  #include "EEPARAMS.h"  #include "EEPARAMS.h"
43  #include "SIZE.h"  #include "SIZE.h"
 cgg   Include ECCO_CPPOPTIONS because the ecco_ctrl,cost files  
 cgg   have headers with options for OBCS masks.  
 #include "ECCO_CPPOPTIONS.h"  
   
44  #include "ctrl.h"  #include "ctrl.h"
45  #include "optim.h"  #include "optim.h"
46  #include "minimization.h"  #include "minimization.h"
# Line 286  c--   Read the data. Line 290  c--   Read the data.
290         do icvar = 1,maxcvars         do icvar = 1,maxcvars
291          if ( ncvarindex(icvar) .ne. -1 ) then          if ( ncvarindex(icvar) .ne. -1 ) then
292           do icvrec = 1,ncvarrecs(icvar)           do icvrec = 1,ncvarrecs(icvar)
293            do bj = 1,nsy  cph          do bj = 1,nsy
294             do bi = 1,nsx  cph           do bi = 1,nsx
295              read( funit ) ncvarindex(icvar)              read( funit ) ncvarindex(icvar)
296              read( funit ) filej              read( funit ) filej
297              read( funit ) filei              read( funit ) filei
# Line 361  c              if (iobcs .eq. 4) vv(icvo Line 365  c              if (iobcs .eq. 4) vv(icvo
365                icvoffset = icvoffset + cbuffindex                icvoffset = icvoffset + cbuffindex
366               endif               endif
367              enddo              enddo
368             enddo  cph           enddo
369            enddo  cph          enddo
370           enddo           enddo
371          endif          endif
372         enddo         enddo

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.13

  ViewVC Help
Powered by ViewVC 1.1.22