Diff of /MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2012/07/30 19:04:55	1.5
+++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2012/09/18 17:06:48	1.6
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.5 2012/07/30 19:04:55 dgoldberg Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.6 2012/09/18 17:06:48 dgoldberg Exp $
 C $Name:  $
 
 
@@ -42,6 +42,8 @@
      &     streamice_max_cg_iter, streamice_max_nl_iter,
      &     STREAMICE_GL_regularize,
      &     STREAMICEthickInit,
+     &     STREAMICEsigcoordInit,
+     &     STREAMICEsigcoordFile,
      &     STREAMICEthickFile,
      &     STREAMICEcalveMaskFile,
      &     STREAMICEison,
@@ -49,10 +51,18 @@
      &     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_adjDump
+     &     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
+
 
       NAMELIST /STREAMICE_PARM02/
      &     shelf_max_draft,
@@ -84,7 +94,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)
 
@@ -106,10 +117,19 @@
       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.
@@ -121,6 +141,8 @@
       STREAMICE_calve_to_mask = .FALSE.
 !      STREAMICE_construct_matrix = .TRUE.
       STREAMICE_lower_cg_tol = .FALSE.
+      STREAMICE_diagnostic_only = .FALSE.
+!       STREAMICE_hybrid_stress= .FALSE.
 
       min_x_noflow_NORTH = 0.
       max_x_noflow_NORTH = 0.
@@ -163,6 +185,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,