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

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2013/06/11 17:42:17	1.16
+++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2014/08/27 19:29:14	1.17
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.16 2013/06/11 17:42:17 dgoldberg Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.17 2014/08/27 19:29:14 dgoldberg Exp $
 C $Name:  $
 
 
@@ -43,7 +43,7 @@
      &     streamice_vel_update,streamice_cg_tol,streamice_nonlin_tol,
      &     streamice_nonlin_tol_fp,
      &     streamice_max_cg_iter, streamice_max_nl_iter,
-     &     STREAMICE_GL_regularize,
+     &     streamice_maxcgiter_cpl, streamice_maxnliter_cpl,
      &     STREAMICEthickInit,
      &     STREAMICEsigcoordInit,
      &     STREAMICEsigcoordFile,
@@ -53,7 +53,7 @@
      &     STREAMICEison,
      &     STREAMICE_dump_mdsio, STREAMICE_tave_mdsio,
      &     STREAMICE_dump_mnc, STREAMICE_tave_mnc,
-     &     STREAMICE_GL_regularize, STREAMICE_move_front,
+     &     STREAMICE_move_front,
      &     STREAMICE_calve_to_mask,
      &     STREAMICE_diagnostic_only,
      &     STREAMICE_lower_cg_tol,
@@ -62,7 +62,10 @@
      &     streamice_bg_surf_slope_x, streamice_bg_surf_slope_y,
      &     streamice_kx_b_init, streamice_ky_b_init,
      &     STREAMICEbasalTracConfig,
+     &     STREAMICEBdotConfig,
      &     STREAMICEbasalTracFile,
+     &     STREAMICEBdotFile,
+     &     STREAMICEBdotTimeDepFile,
      &     STREAMICEvelOptimFile,
      &     STREAMICEtopogFile,
      &     STREAMICEhmaskFile,
@@ -72,6 +75,16 @@
      &     STREAMICEvFaceBdryFile,
      &     STREAMICEuDirichValsFile,
      &     STREAMICEvDirichValsFile, 
+     &     STREAMICEuMassFluxFile, 
+     &     STREAMICEvMassFluxFile, 
+     &     STREAMICEuNormalStressFile,
+     &     STREAMICEvNormalStressFile,
+     &     STREAMICEuShearStressFile,
+     &     STREAMICEvShearStressFile,
+     &     STREAMICEuNormalTimeDepFile,
+     &     STREAMICEvNormalTimeDepFile,
+     &     STREAMICEuShearTimeDepFile,
+     &     STREAMICEvShearTimeDepFile,
      &     STREAMICEGlenConstFile, STREAMICEGlenConstConfig,
      &     STREAMICE_ppm_driving_stress,
      &     STREAMICE_h_ctrl_const_surf,
@@ -80,7 +93,10 @@
      &     streamice_addl_backstress,
      &     streamice_smooth_gl_width,
      &     streamice_adot_uniform,
-     &     STREAMICE_ADV_SCHEME
+     &     STREAMICE_ADV_SCHEME, streamice_forcing_period,
+     &     STREAMICE_chkfixedptconvergence,
+     &     STREAMICE_chkresidconvergence,
+     &     STREAMICE_allow_cpl
 
 #ifdef ALLOW_STREAMICE_2DTRACER
       NAMELIST /STREAMICE_PARMTRACER/
@@ -147,13 +163,15 @@
       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_vel_update = deltaT ! 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_maxcgiter_cpl = 0
+      streamice_maxnliter_cpl = 0
+!      streamice_n_sub_regularize = 4
       streamice_CFL_factor = .5
       streamice_adjDump = 0.
       streamice_bg_surf_slope_x = .0
@@ -168,6 +186,7 @@
       streamice_addl_backstress = 0.0
       streamice_smooth_gl_width = 0.0
       streamice_adot_uniform = 0.0
+      streamice_forcing_period = 0
 
       STREAMICEthickInit = 'FILE'
       STREAMICEthickFile = ' '
@@ -175,12 +194,24 @@
       STREAMICEsigcoordInit = 'UNIFORM'
       STREAMICEsigcoordFile = ' '
       STREAMICEbasalTracConfig = 'UNIFORM'
+      STREAMICEBdotConfig = ''
+      STREAMICEBdotFile = ''
+      STREAMICEBdotTimeDepFile = ' '
       STREAMICEbasalTracFile = ' '
       STREAMICEvelOptimFile = ''
       STREAMICEtopogFile = ''
       STREAMICEhmaskFile = ''
       STREAMICEHBCyFile = ''
       STREAMICEHBCxFile = ''
+      STREAMICEuNormalStressFile = ''
+      STREAMICEvNormalStressFile = ''
+      STREAMICEuShearStressFile = ''
+      STREAMICEvShearStressFile = ''
+      STREAMICEuNormalTimeDepFile = ' '
+      STREAMICEvNormalTimeDepFile = ' '
+      STREAMICEuShearTimeDepFile = ' '
+      STREAMICEvShearTimeDepFile = ' '
+
 #ifdef ALLOW_STREAMICE_2DTRACER
       STREAMICETrac2DBCxFile = ''
       STREAMICETrac2DBCyFile = ''
@@ -190,6 +221,8 @@
       STREAMICEvFaceBdryFile = ''
       STREAMICEuDirichValsFile = ''
       STREAMICEvDirichValsFile = ''
+      STREAMICEuMassFluxFile = ''
+      STREAMICEvMassFluxFile = ''
       STREAMICEGlenConstFile = ''
       STREAMICEcostMaskFile = ''
       STREAMICEGlenConstConfig = 'UNIFORM'
@@ -215,7 +248,7 @@
       STREAMICE_dump_mdsio = .TRUE.
       STREAMICE_dump_mnc = .FALSE. 
       STREAMICE_tave_mnc = .FALSE.
-      STREAMICE_GL_regularize = .FALSE.
+!      STREAMICE_GL_regularize = .FALSE.
       STREAMICE_move_front = .FALSE.
       STREAMICE_calve_to_mask = .FALSE.
 !       STREAMICE_geom_file_setup = .FALSE.
@@ -223,7 +256,10 @@
       STREAMICE_lower_cg_tol = .FALSE.
       STREAMICE_diagnostic_only = .FALSE.
       STREAMICE_ppm_driving_stress = .FALSE.
+      STREAMICE_chkfixedptconvergence = .true.
+      STREAMICE_chkresidconvergence = .true.
       STREAMICE_h_ctrl_const_surf = .FALSE.
+      STREAMICE_allow_cpl = .false.
 !       STREAMICE_hybrid_stress= .FALSE.
 
       min_x_noflow_NORTH = 0.