/[MITgcm]/MITgcm_contrib/dgoldberg/streamice/STREAMICE.h
ViewVC logotype

Diff of /MITgcm_contrib/dgoldberg/streamice/STREAMICE.h

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

revision 1.19 by dgoldberg, Thu Mar 7 15:23:19 2013 UTC revision 1.20 by dgoldberg, Sat Apr 6 17:43:41 2013 UTC
# Line 98  C     -------------------------- CHAR PA Line 98  C     -------------------------- CHAR PA
98        CHARACTER*(MAX_LEN_FNAM) STREAMICEvFaceBdryFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEvFaceBdryFile
99        CHARACTER*(MAX_LEN_FNAM) STREAMICEuDirichValsFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEuDirichValsFile
100        CHARACTER*(MAX_LEN_FNAM) STREAMICEvDirichValsFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEvDirichValsFile
101    
102    !     CHARACTER PARAMS FOR PETSC
103          CHARACTER*(MAX_LEN_FNAM) PETSC_SOLVER_TYPE
104          CHARACTER*(MAX_LEN_FNAM) PETSC_PRECOND_TYPE
105                
106                
107        COMMON /STREAMICE_PARM_C/        COMMON /STREAMICE_PARM_C/
# Line 119  C     -------------------------- CHAR PA Line 123  C     -------------------------- CHAR PA
123       &     STREAMICEGlenConstFile,       &     STREAMICEGlenConstFile,
124       &     STREAMICEGlenConstConfig,       &     STREAMICEGlenConstConfig,
125       &     STREAMICEcostMaskFile       &     STREAMICEcostMaskFile
126    
127          COMMON /PETSC_PARM_C/
128         &     PETSC_SOLVER_TYPE,
129         &     PETSC_PRECOND_TYPE
130            
131  C     -------------------------- LOGICAL PARAMS ---------------------------------------------------  C     -------------------------- LOGICAL PARAMS ---------------------------------------------------
132    
# Line 338  C Line 346  C
346  C       visc & tau are now calculated based on U,V in streamice_vel_solve  C       visc & tau are now calculated based on U,V in streamice_vel_solve
347  C        but with Hybdrid stress formulation they will become part of  C        but with Hybdrid stress formulation they will become part of
348  C        velocity initial guess, so they are kept  C        velocity initial guess, so they are kept
349    
350    #ifdef ALLOW_PETSC
351          COMMON /STREAMICE_PETSC_DOFS_COMMON/
352         &      streamice_petsc_dofs_u,
353         &      streamice_petsc_dofs_v,
354         &      n_dofs_process
355          _RS streamice_petsc_dofs_u
356         & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
357          _RS streamice_petsc_dofs_v
358         & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
359          INTEGER n_dofs_process (0:nPx*nPy-1)
360    #endif
361                
362                
363  #endif /* ALLOW_STREAMICE */  #endif /* ALLOW_STREAMICE */

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.22