--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2012/03/29 15:59:21	1.1
+++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2013/04/06 17:43:41	1.13
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.1 2012/03/29 15:59:21 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.13 2013/04/06 17:43:41 dgoldberg Exp $
 C $Name:  $
 
 
@@ -35,22 +35,50 @@
 
       NAMELIST /STREAMICE_PARM01/
      &     streamice_density, streamice_density_ocean_avg,
-     &     A_glen_isothermal, n_glen, eps_glen_min,
+     &     B_glen_isothermal, n_glen, eps_glen_min, eps_u_min,
      &     C_basal_fric_const, n_basal_friction, 
      &     streamice_vel_update,streamice_cg_tol,streamice_nonlin_tol,
+     &     streamice_nonlin_tol_fp,
      &     streamice_max_cg_iter, streamice_max_nl_iter,
      &     STREAMICE_GL_regularize,
      &     STREAMICEthickInit,
+     &     STREAMICEsigcoordInit,
+     &     STREAMICEsigcoordFile,
      &     STREAMICEthickFile,
      &     STREAMICEcalveMaskFile,
+     &     STREAMICEcostMaskFile,
      &     STREAMICEison,
      &     STREAMICE_dump_mdsio, STREAMICE_tave_mdsio,
      &     STREAMICE_dump_mnc, STREAMICE_tave_mnc,
      &     STREAMICE_GL_regularize, STREAMICE_move_front,
      &     STREAMICE_calve_to_mask,
-     &     STREAMICE_construct_matrix,
+!      &     STREAMICE_geom_file_setup,
+     &     STREAMICE_diagnostic_only,
+!     &     STREAMICE_construct_matrix,
      &     STREAMICE_lower_cg_tol,
-     &     streamice_CFL_factor
+     &     streamice_CFL_factor,
+     &     streamice_adjDump,
+!      &     STREAMICE_hybrid_stress,
+     &     streamice_bg_surf_slope_x, streamice_bg_surf_slope_y,
+     &     streamice_kx_b_init, streamice_ky_b_init,
+     &     STREAMICEbasalTracConfig,
+     &     STREAMICEbasalTracFile,
+     &     STREAMICEvelOptimFile,
+     &     STREAMICEtopogFile,
+     &     STREAMICEhmaskFile,
+     &     STREAMICEuFaceBdryFile,
+     &     STREAMICEvFaceBdryFile,
+     &     STREAMICEuDirichValsFile,
+     &     STREAMICEvDirichValsFile, 
+     &     STREAMICEGlenConstFile, STREAMICEGlenConstConfig,
+     &     STREAMICE_ppm_driving_stress,
+     &     STREAMICE_h_ctrl_const_surf,
+     &     streamice_wgt_drift,streamice_wgt_surf,streamice_wgt_vel,
+     &     streamice_wgt_avthick, streamice_wgt_tikh, 
+     &     streamice_addl_backstress,
+     &     streamice_smooth_gl_width,
+     &     PETSC_PRECOND_TYPE, PETSC_SOLVER_TYPE    
+
 
       NAMELIST /STREAMICE_PARM02/
      &     shelf_max_draft,
@@ -82,7 +110,8 @@
      &     min_y_CFBC_WEST, max_y_CFBC_WEST,
      &     min_y_CFBC_EAST, max_y_CFBC_EAST,
      &     flux_bdry_val_SOUTH, flux_bdry_val_NORTH,
-     &     flux_bdry_val_WEST, flux_bdry_val_EAST
+     &     flux_bdry_val_WEST, flux_bdry_val_EAST,
+     &     STREAMICE_NS_periodic, STREAMICE_EW_periodic
 
       _BEGIN_MASTER(myThid)
 
@@ -90,22 +119,52 @@
 
       streamice_density = 917. 
       streamice_density_ocean_avg = 1024.
-      A_glen_isothermal = 9.461e-18   !  Pa (-1/3) a
+      B_glen_isothermal = 9.461e-18   !  Pa (-1/3) a
       n_glen = 3.
       eps_glen_min = 1.0e-12
+      eps_u_min = 1.0e-6
       C_basal_fric_const = 31.71 ! Pa (m/a)-1n
       n_basal_friction = 1.
       streamice_vel_update = 169200. ! seconds
       streamice_cg_tol = 1e-6
       streamice_nonlin_tol = 1e-6
+      streamice_nonlin_tol_fp = 1.e-14
       streamice_max_cg_iter = 2000
       streamice_max_nl_iter = 100
       streamice_n_sub_regularize = 4
       streamice_CFL_factor = .5
-      
+      streamice_adjDump = 0.
+      streamice_bg_surf_slope_x = .0
+      streamice_bg_surf_slope_y = 0.
+      streamice_kx_b_init = 1.
+      streamice_ky_b_init = 1.
+      streamice_wgt_drift = 0.
+      streamice_wgt_tikh = 0.
+      streamice_wgt_surf = 0.     
+      streamice_wgt_vel = 0.     
+      streamice_wgt_avthick = 0.
+      streamice_addl_backstress = 0.0
+      streamice_smooth_gl_width = 0.0
+
       STREAMICEthickInit = 'FILE'
       STREAMICEthickFile = ' '
       STREAMICEcalveMaskFile = ' '
+      STREAMICEsigcoordInit = 'UNIFORM'
+      STREAMICEsigcoordFile = ' '
+      STREAMICEbasalTracConfig = 'UNIFORM'
+      STREAMICEbasalTracFile = ' '
+      STREAMICEvelOptimFile = ''
+      STREAMICEtopogFile = ''
+      STREAMICEhmaskFile = ''
+      STREAMICEuFaceBdryFile = ''
+      STREAMICEvFaceBdryFile = ''
+      STREAMICEuDirichValsFile = ''
+      STREAMICEvDirichValsFile = ''
+      STREAMICEGlenConstFile = ''
+      STREAMICEcostMaskFile = ''
+      STREAMICEGlenConstConfig = 'UNIFORM'
+      PETSC_PRECOND_TYPE = 'PCBJACOBI'
+      PETSC_SOLVER_TYPE = 'KSPCG'
 
       STREAMICEison = .TRUE.
       STREAMICE_tave_mdsio = .TRUE.
@@ -115,8 +174,13 @@
       STREAMICE_GL_regularize = .FALSE.
       STREAMICE_move_front = .FALSE.
       STREAMICE_calve_to_mask = .FALSE.
-      STREAMICE_construct_matrix = .TRUE.
+!       STREAMICE_geom_file_setup = .FALSE.
+!      STREAMICE_construct_matrix = .TRUE.
       STREAMICE_lower_cg_tol = .FALSE.
+      STREAMICE_diagnostic_only = .FALSE.
+      STREAMICE_ppm_driving_stress = .FALSE.
+      STREAMICE_h_ctrl_const_surf = .FALSE.
+!       STREAMICE_hybrid_stress= .FALSE.
 
       min_x_noflow_NORTH = 0.
       max_x_noflow_NORTH = 0.
@@ -159,6 +223,8 @@
       flux_bdry_val_WEST = 0.
       flux_bdry_val_EAST = 0.
 
+      STREAMICE_NS_periodic = .FALSE.
+      STREAMICE_EW_periodic = .FALSE. 
 
       WRITE(msgBuf,'(A)') 'STREAMICE_READPARMS: opening data.streamice'
       CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
@@ -174,16 +240,16 @@
      &    'STREAMICE_READPARMS: read first param block'
       CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
      &    SQUEEZE_RIGHT , 1)
-      READ(UNIT=iUnit,NML=STREAMICE_PARM02)
 
       IF (TRIM(STREAMICEthickInit) .eq. "PARAM") THEN
+       READ(UNIT=iUnit,NML=STREAMICE_PARM02)
         WRITE(msgBuf,'(A)')
      &    'STREAMICE_READPARMS: read second param block'
        CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
      &    SQUEEZE_RIGHT , 1)
-       READ(UNIT=iUnit,NML=STREAMICE_PARM03)
       ENDIF
 
+      READ(UNIT=iUnit,NML=STREAMICE_PARM03)
       WRITE(msgBuf,'(A)')
      &    'STREAMICE_READPARMS: read third param block'
       CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,