Changeset 7741


Ignore:
Timestamp:
2017-02-27T14:25:47+01:00 (4 years ago)
Author:
jcastill
Message:

Move some lines to allow merging with another branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/r6232_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90

    r7739 r7741  
    3333   INTEGER , PARAMETER ::   jp_vtau = 2   ! index of wind stress (j-component) file 
    3434   INTEGER , PARAMETER ::   jp_qtot = 3   ! index of total (non solar+solar) heat file 
     35 
     36   ! These lines are here just to allow merging with another branch 
     37   INTEGER, PUBLIC            ::   nn_drag        ! type of formula to calculate wind stress from wind components 
     38   INTEGER, PUBLIC, PARAMETER ::   jp_ukmo  = 0        ! UKMO SHELF formulation 
     39   INTEGER, PUBLIC, PARAMETER ::   jp_std   = 1        ! standard formulation with forced or coupled drag coefficient  
     40   INTEGER, PUBLIC, PARAMETER ::   jp_const = 2        ! standard formulation with constant drag coefficient  
     41 
    3542   INTEGER , PARAMETER ::   jp_qsr  = 4   ! index of solar heat file 
    3643   INTEGER , PARAMETER ::   jp_emp  = 5   ! index of evaporation-precipation file 
     
    3845   LOGICAL , PUBLIC    ::   ln_shelf_flx = .FALSE. ! UKMO SHELF specific flux flag 
    3946   INTEGER             ::   jpfld_local   ! maximum number of files to read (locally modified depending on ln_shelf_flx)  
    40  
    41    INTEGER, PUBLIC            ::   nn_drag        ! type of formula to calculate wind stress from wind components 
    42    INTEGER, PUBLIC, PARAMETER ::   jp_ukmo  = 0        ! UKMO SHELF formulation 
    43    INTEGER, PUBLIC, PARAMETER ::   jp_std   = 1        ! standard formulation with forced or coupled drag coefficient  
    44    INTEGER, PUBLIC, PARAMETER ::   jp_const = 2        ! standard formulation with constant drag coefficient  
    4547 
    4648   !! * Substitutions 
Note: See TracChangeset for help on using the changeset viewer.