/[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.21 by dgoldberg, Thu May 23 22:12:33 2013 UTC
# Line 85  C     -------------------------- CHAR PA Line 85  C     -------------------------- CHAR PA
85        CHARACTER*(MAX_LEN_FNAM) STREAMICEdelsigFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEdelsigFile
86        CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracConfig        CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracConfig
87        CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstConfig        CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstConfig
88          CHARACTER*(MAX_LEN_FNAM) STREAMICEBdotConfig
89        CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracFile
90        CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstFile
91          CHARACTER*(MAX_LEN_FNAM) STREAMICEBdotFile
92        CHARACTER*(MAX_LEN_FNAM) STREAMICEvelOptimFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEvelOptimFile
93        CHARACTER*(MAX_LEN_FNAM) STREAMICEtopogFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEtopogFile
94        CHARACTER*(MAX_LEN_FNAM) STREAMICEcostMaskFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEcostMaskFile
# Line 98  C     -------------------------- CHAR PA Line 100  C     -------------------------- CHAR PA
100        CHARACTER*(MAX_LEN_FNAM) STREAMICEvFaceBdryFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEvFaceBdryFile
101        CHARACTER*(MAX_LEN_FNAM) STREAMICEuDirichValsFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEuDirichValsFile
102        CHARACTER*(MAX_LEN_FNAM) STREAMICEvDirichValsFile        CHARACTER*(MAX_LEN_FNAM) STREAMICEvDirichValsFile
103    
104    !     CHARACTER PARAMS FOR PETSC
105          CHARACTER*(MAX_LEN_FNAM) PETSC_SOLVER_TYPE
106          CHARACTER*(MAX_LEN_FNAM) PETSC_PRECOND_TYPE
107                
108                
109        COMMON /STREAMICE_PARM_C/        COMMON /STREAMICE_PARM_C/
# Line 118  C     -------------------------- CHAR PA Line 124  C     -------------------------- CHAR PA
124       &     STREAMICEvDirichValsFile,       &     STREAMICEvDirichValsFile,
125       &     STREAMICEGlenConstFile,       &     STREAMICEGlenConstFile,
126       &     STREAMICEGlenConstConfig,       &     STREAMICEGlenConstConfig,
127         &     STREAMICEBdotFile,
128         &     STREAMICEBdotConfig,
129       &     STREAMICEcostMaskFile       &     STREAMICEcostMaskFile
130    
131          COMMON /PETSC_PARM_C/
132         &     PETSC_SOLVER_TYPE,
133         &     PETSC_PRECOND_TYPE
134            
135  C     -------------------------- LOGICAL PARAMS ---------------------------------------------------  C     -------------------------- LOGICAL PARAMS ---------------------------------------------------
136    
# Line 338  C Line 350  C
350  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
351  C        but with Hybdrid stress formulation they will become part of  C        but with Hybdrid stress formulation they will become part of
352  C        velocity initial guess, so they are kept  C        velocity initial guess, so they are kept
353    
354    #ifdef ALLOW_PETSC
355          COMMON /STREAMICE_PETSC_DOFS_COMMON/
356         &      streamice_petsc_dofs_u,
357         &      streamice_petsc_dofs_v,
358         &      n_dofs_process
359          _RS streamice_petsc_dofs_u
360         & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
361          _RS streamice_petsc_dofs_v
362         & (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
363          INTEGER n_dofs_process (0:nPx*nPy-1)
364    #endif
365                
366                
367  #endif /* ALLOW_STREAMICE */  #endif /* ALLOW_STREAMICE */
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.21
  ViewVC Help
Powered by ViewVC 1.1.22