--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F 2012/03/29 15:59:21 1.1 +++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F 2012/07/24 20:49:41 1.3 @@ -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.3 2012/07/24 20:49:41 dgoldberg Exp $ C $Name: $ @@ -48,7 +48,7 @@ & STREAMICE_dump_mnc, STREAMICE_tave_mnc, & STREAMICE_GL_regularize, STREAMICE_move_front, & STREAMICE_calve_to_mask, - & STREAMICE_construct_matrix, +! & STREAMICE_construct_matrix, & STREAMICE_lower_cg_tol, & streamice_CFL_factor @@ -115,7 +115,7 @@ STREAMICE_GL_regularize = .FALSE. STREAMICE_move_front = .FALSE. STREAMICE_calve_to_mask = .FALSE. - STREAMICE_construct_matrix = .TRUE. +! STREAMICE_construct_matrix = .TRUE. STREAMICE_lower_cg_tol = .FALSE. min_x_noflow_NORTH = 0. @@ -174,16 +174,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,