Ignore:
Timestamp:
Apr 5, 2016 4:30:18 PM (8 years ago)
Author:
maronga
Message:

removed parameter file check. update of mrungui for compilation with qt5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/check_open.f90

    r1784 r1804  
    1111! A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
    1212!
    13 ! You should have received a copy of the GNU General Public License along with
     13! You should have received a copy of the GNU fGeneral Public License along with
    1414! PALM. If not, see <http://www.gnu.org/licenses/>.
    1515!
     
    1919! Current revisions:
    2020! -----------------
    21 !
     21! Removed code for parameter file check (__check)
    2222!
    2323! Former revisions:
     
    208208    IF ( openfile(file_id)%opened )  RETURN
    209209
    210 #if ! defined ( __check )
    211210!
    212211!-- Only certain files are allowed to be re-opened
     
    231230       END SELECT
    232231    ENDIF
    233 #endif
    234232
    235233!
     
    283281       CASE ( 11 )
    284282
    285 #if defined ( __check )
    286 !
    287 !--       In case of a prior parameter file check, the p3d data is stored in
    288 !--       PARIN, while the p3df is stored in PARINF. This only applies to
    289 !--       check_namelist_files!
    290           IF ( check_restart == 2 ) THEN
    291              OPEN ( 11, FILE='PARINF'//TRIM( coupling_char ),                  &
    292                         FORM='FORMATTED', STATUS='OLD' )
    293           ELSE
    294              OPEN ( 11, FILE='PARIN'//TRIM( coupling_char ), FORM='FORMATTED', &
    295                         STATUS='OLD' )
    296           END IF
    297 #else
    298 
    299283          OPEN ( 11, FILE='PARIN'//TRIM( coupling_char ), FORM='FORMATTED',    &
    300284                     STATUS='OLD' )
    301 #endif
    302285
    303286       CASE ( 13 )
     
    328311                CALL local_system( 'mkdir  BINOUT' // TRIM( coupling_char ) )
    329312             ENDIF
    330 #if defined( __parallel ) && ! defined ( __check )
     313#if defined( __parallel )
    331314!
    332315!--          Set a barrier in order to allow that all other processors in the
     
    371354                        FORM='UNFORMATTED', POSITION='APPEND' )
    372355          ELSE
    373 #if defined( __parallel ) && ! defined ( __check )
     356#if defined( __parallel )
    374357!
    375358!--          Set a barrier in order to allow that all other processors in the
     
    563546                                   TRIM( coupling_char ) )
    564547             ENDIF
    565 #if defined( __parallel ) && ! defined ( __check )
     548#if defined( __parallel )
    566549!
    567550!--          Set a barrier in order to allow that thereafter all other
     
    615598                                   TRIM( coupling_char ) )
    616599             ENDIF
    617 #if defined( __parallel ) && ! defined ( __check )
     600#if defined( __parallel )
    618601!
    619602!--          Set a barrier in order to allow that thereafter all other
     
    673656                CALL netcdf_handle_error( 'check_open', 21 )
    674657                IF ( myid == 0 )  CALL local_system( 'rm ' // TRIM( filename ) )
    675 #if defined( __parallel ) && ! defined ( __check )
     658#if defined( __parallel )
    676659!
    677660!--             Set a barrier in order to assure that PE0 deleted the old file
     
    735718                CALL netcdf_handle_error( 'check_open', 24 )
    736719                IF ( myid == 0 )  CALL local_system( 'rm ' // TRIM( filename ) )
    737 #if defined( __parallel ) && ! defined ( __check )
     720#if defined( __parallel )
    738721!
    739722!--             Set a barrier in order to assure that PE0 deleted the old file
     
    797780                CALL netcdf_handle_error( 'check_open', 27 )
    798781                IF ( myid == 0 )  CALL local_system( 'rm ' // TRIM( filename ) )
    799 #if defined( __parallel ) && ! defined ( __check )
     782#if defined( __parallel )
    800783!
    801784!--             Set a barrier in order to assure that PE0 deleted the old file
     
    940923                CALL netcdf_handle_error( 'check_open', 36 )
    941924                IF ( myid == 0 )  CALL local_system( 'rm ' // TRIM( filename ) )
    942 #if defined( __parallel ) && ! defined ( __check )
     925#if defined( __parallel )
    943926!
    944927!--             Set a barrier in order to assure that PE0 deleted the old file
     
    10571040                                       TRIM( coupling_char ) // '/' )
    10581041                ENDIF
    1059 #if defined( __parallel ) && ! defined ( __check )
     1042#if defined( __parallel )
    10601043!
    10611044!--             Set a barrier in order to allow that all other processors in the
Note: See TracChangeset for help on using the changeset viewer.