--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2012/05/14 16:47:27	1.2
+++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2012/09/27 20:29:00	1.7
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.2 2012/05/14 16:47:27 dgoldberg Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.7 2012/09/27 20:29:00 dgoldberg Exp $
 C $Name:  $
 
 
@@ -38,9 +38,12 @@
      &     A_glen_isothermal, n_glen, eps_glen_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,
      &     STREAMICEison,
@@ -48,9 +51,20 @@
      &     STREAMICE_dump_mnc, STREAMICE_tave_mnc,
      &     STREAMICE_GL_regularize, STREAMICE_move_front,
      &     STREAMICE_calve_to_mask,
+     &     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,
+     &     STREAMICE_ppm_driving_stress,
+     &     STREAMICE_h_ctrl_const_surf
+
 
       NAMELIST /STREAMICE_PARM02/
      &     shelf_max_draft,
@@ -82,7 +96,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)
 
@@ -98,14 +113,25 @@
       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.
+
       STREAMICEthickInit = 'FILE'
       STREAMICEthickFile = ' '
       STREAMICEcalveMaskFile = ' '
+      STREAMICEsigcoordInit = 'UNIFORM'
+      STREAMICEsigcoordFile = ' '
+      STREAMICEbasalTracConfig = 'UNIFORM'
+      STREAMICEbasalTracFile = ' '
+      STREAMICEvelOptimFile = ''
 
       STREAMICEison = .TRUE.
       STREAMICE_tave_mdsio = .TRUE.
@@ -117,6 +143,10 @@
       STREAMICE_calve_to_mask = .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 +189,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 +206,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,