Changeset 11816


Ignore:
Timestamp:
2019-10-28T17:10:34+01:00 (11 months ago)
Author:
laurent
Message:

A few rogue "STOP"s become "ctl_stop"!

Location:
NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC/sbcblk_algo_coare3p0.F90

    r11785 r11816  
    7070      IF ( l_use_wl ) THEN 
    7171         ierr = 0 
    72          ALLOCATE ( Tau_ac(jpi,jpj) , Qnt_ac(jpi,jpj), Hz_wl(jpi,jpj), dT_wl(jpi,jpj), STAT=ierr ) 
    73          !IF( ierr > 0 ) STOP ' COARE3P0_INIT => allocation of Tau_ac, Qnt_ac, dT_wl & Hz_wl failed!' 
     72         ALLOCATE ( Tau_ac(jpi,jpj) , Qnt_ac(jpi,jpj), dT_wl(jpi,jpj), Hz_wl(jpi,jpj), STAT=ierr ) 
     73         IF( ierr > 0 ) CALL ctl_stop( ' COARE3P0_INIT => allocation of Tau_ac, Qnt_ac, dT_wl & Hz_wl failed!' ) 
    7474         Tau_ac(:,:) = 0._wp 
    7575         Qnt_ac(:,:) = 0._wp 
     
    7777         Hz_wl(:,:)  = Hwl_max 
    7878      END IF 
    79       !! 
    8079      IF ( l_use_cs ) THEN 
    8180         ierr = 0 
    8281         ALLOCATE ( dT_cs(jpi,jpj), STAT=ierr ) 
    83          !IF( ierr > 0 ) STOP ' COARE3P0_INIT => allocation of dT_cs failed!' 
     82         IF( ierr > 0 ) CALL ctl_stop( ' COARE3P0_INIT => allocation of dT_cs failed!' ) 
    8483         dT_cs(:,:) = -0.25_wp  ! First guess of skin correction 
    8584      END IF 
     
    202201 
    203202      !! Initializations for cool skin and warm layer: 
    204       IF ( l_use_cs ) THEN 
    205          IF( .NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp)) ) THEN 
    206             PRINT *, ' * PROBLEM ('//TRIM(crtnm)//'): you need to provide Qsw, rad_lw & slp to use cool-skin param!'; STOP 
    207          END IF 
    208       END IF 
    209  
    210       IF ( l_use_wl ) THEN 
    211          IF( .NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp)) ) THEN 
    212             PRINT *, ' * PROBLEM ('//TRIM(crtnm)//'): you need to provide Qsw, rad_lw & slp to use warm-layer param!'; STOP 
    213          END IF 
    214       END IF 
    215  
     203      IF ( l_use_cs .AND. (.NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp))) ) & 
     204         &   CALL ctl_stop( '['//TRIM(crtnm)//'] => ' , 'you need to provide Qsw, rad_lw & slp to use cool-skin param!' ) 
     205       
     206      IF ( l_use_wl .AND. (.NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp)     & 
     207         &  .AND. PRESENT(isecday_utc) .AND. PRESENT(plong)) ) ) & 
     208         &   CALL ctl_stop( '['//TRIM(crtnm)//'] => ' , 'you need to provide Qsw, rad_lw, slp, isecday_utc', & 
     209         &   ' & plong to use warm-layer param!'  ) 
     210       
    216211      IF ( l_use_cs .OR. l_use_wl ) THEN 
    217212         ALLOCATE ( zsst(jpi,jpj) ) 
  • NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC/sbcblk_algo_coare3p6.F90

    r11785 r11816  
    7070      IF ( l_use_wl ) THEN 
    7171         ierr = 0 
    72          ALLOCATE ( Tau_ac(jpi,jpj) , Qnt_ac(jpi,jpj), Hz_wl(jpi,jpj), dT_wl(jpi,jpj), STAT=ierr ) 
    73          !IF( ierr > 0 ) STOP ' COARE3P6_INIT => allocation of Tau_ac, Qnt_ac, dT_wl & Hz_wl failed!' 
     72         ALLOCATE ( Tau_ac(jpi,jpj) , Qnt_ac(jpi,jpj), dT_wl(jpi,jpj), Hz_wl(jpi,jpj), STAT=ierr ) 
     73         IF( ierr > 0 ) CALL ctl_stop( ' COARE3P6_INIT => allocation of Tau_ac, Qnt_ac, dT_wl & Hz_wl failed!' ) 
    7474         Tau_ac(:,:) = 0._wp 
    7575         Qnt_ac(:,:) = 0._wp 
     
    7777         Hz_wl(:,:)  = Hwl_max 
    7878      END IF 
    79       !! 
    8079      IF ( l_use_cs ) THEN 
    8180         ierr = 0 
    8281         ALLOCATE ( dT_cs(jpi,jpj), STAT=ierr ) 
    83          !IF( ierr > 0 ) STOP ' COARE3P6_INIT => allocation of dT_cs failed!' 
     82         IF( ierr > 0 ) CALL ctl_stop( ' COARE3P6_INIT => allocation of dT_cs failed!' ) 
    8483         dT_cs(:,:) = -0.25_wp  ! First guess of skin correction 
    8584      END IF 
     
    202201 
    203202      !! Initializations for cool skin and warm layer: 
    204       IF ( l_use_cs ) THEN 
    205          IF( .NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp)) ) THEN 
    206             PRINT *, ' * PROBLEM ('//TRIM(crtnm)//'): you need to provide Qsw, rad_lw & slp to use cool-skin param!'; STOP 
    207          END IF 
    208       END IF 
    209  
    210       IF ( l_use_wl ) THEN 
    211          IF( .NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp)) ) THEN 
    212             PRINT *, ' * PROBLEM ('//TRIM(crtnm)//'): you need to provide Qsw, rad_lw & slp to use warm-layer param!'; STOP 
    213          END IF 
    214       END IF 
     203      IF ( l_use_cs .AND. (.NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp))) ) & 
     204         &   CALL ctl_stop( '['//TRIM(crtnm)//'] => ' , 'you need to provide Qsw, rad_lw & slp to use cool-skin param!' ) 
     205 
     206      IF ( l_use_wl .AND. (.NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp)     & 
     207         &  .AND. PRESENT(isecday_utc) .AND. PRESENT(plong)) ) ) & 
     208         &   CALL ctl_stop( '['//TRIM(crtnm)//'] => ' , 'you need to provide Qsw, rad_lw, slp, isecday_utc', & 
     209         &   ' & plong to use warm-layer param!'  ) 
    215210 
    216211      IF ( l_use_cs .OR. l_use_wl ) THEN 
  • NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/src/OCE/SBC/sbcblk_algo_ecmwf.F90

    r11785 r11816  
    7777         ierr = 0 
    7878         ALLOCATE ( dT_wl(jpi,jpj), Hz_wl(jpi,jpj), STAT=ierr ) 
    79          !IF( ierr > 0 ) STOP ' ECMWF_INIT => allocation of dT_wl & Hz_wl failed!' 
     79         IF( ierr > 0 ) CALL ctl_stop( ' ECMWF_INIT => allocation of dT_wl & Hz_wl failed!' ) 
    8080         dT_wl(:,:)  = 0._wp 
    8181         Hz_wl(:,:)  = rd0 ! (rd0, constant, = 3m is default for Zeng & Beljaars) 
    8282      END IF 
    83       !! 
    8483      IF ( l_use_cs ) THEN 
    8584         ierr = 0 
    8685         ALLOCATE ( dT_cs(jpi,jpj), STAT=ierr ) 
    87          !IF( ierr > 0 ) STOP ' ECMWF_INIT => allocation of dT_cs failed!' 
     86         IF( ierr > 0 ) CALL ctl_stop( ' ECMWF_INIT => allocation of dT_cs failed!' ) 
    8887         dT_cs(:,:) = -0.25_wp  ! First guess of skin correction 
    8988      END IF 
     
    9695      &                      Cdn, Chn, Cen,                                           & 
    9796      &                      Qsw, rad_lw, slp, pdT_cs,                                & ! optionals for cool-skin (and warm-layer) 
    98       &                      pdT_wl, pHz_wl )                                                 ! optionals for warm-layer only 
     97      &                      pdT_wl, pHz_wl )                                           ! optionals for warm-layer only 
    9998      !!---------------------------------------------------------------------- 
    10099      !!                      ***  ROUTINE  turb_ecmwf  *** 
     
    206205 
    207206      !! Initializations for cool skin and warm layer: 
    208       IF ( l_use_cs ) THEN 
    209          IF( .NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp)) ) THEN 
    210             PRINT *, ' * PROBLEM ('//TRIM(crtnm)//'): you need to provide Qsw, rad_lw & slp to use cool-skin param!'; STOP 
    211          END IF 
    212       END IF 
    213  
    214       IF ( l_use_wl ) THEN 
    215          IF( .NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp)) ) THEN 
    216             PRINT *, ' * PROBLEM ('//TRIM(crtnm)//'): you need to provide Qsw, rad_lw & slp to use warm-layer param!'; STOP 
    217          END IF 
    218       END IF 
     207      IF ( l_use_cs .AND. (.NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp))) ) & 
     208         &   CALL ctl_stop( '['//TRIM(crtnm)//'] => ' , 'you need to provide Qsw, rad_lw & slp to use cool-skin param!' ) 
     209 
     210      IF ( l_use_wl .AND. (.NOT.(PRESENT(Qsw) .AND. PRESENT(rad_lw) .AND. PRESENT(slp))) ) & 
     211         &   CALL ctl_stop( '['//TRIM(crtnm)//'] => ' , 'you need to provide Qsw, rad_lw & slp to use warm-layer param!' ) 
    219212 
    220213      IF ( l_use_cs .OR. l_use_wl ) THEN 
Note: See TracChangeset for help on using the changeset viewer.