Changeset 5847

Timestamp:

2015-11-02T10:43:45+01:00 (8 years ago)

Author:

jcastill

Message:

Removing key_ww3

File:

• branches/UKMO/dev_r5518_ww3_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_ww3_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -105 +105 @@
    INTEGER, PARAMETER ::   jpr_e3t1st = 41            ! first T level thickness 
    INTEGER, PARAMETER ::   jpr_fraqsr = 42            ! fraction of solar net radiation absorbed in the first ocean level
-#if defined key_ww3
    INTEGER, PARAMETER ::   jpr_hsig   = 43            ! Hsig
    INTEGER, PARAMETER ::   jpr_phioc  = 44            ! Wave=>ocean energy flux
    INTEGER, PARAMETER ::   jprcv      = 44            ! total number of fields received 
-#else
-   INTEGER, PARAMETER ::   jprcv      = 42            ! total number of fields received
-#ENDIF
 
    INTEGER, PARAMETER ::   jps_fice   =  1            ! ice fraction sent to the atmosphere
@@ -141 +137 @@
    INTEGER, PARAMETER ::   jps_e3t1st = 27            ! first level depth (vvl)
    INTEGER, PARAMETER ::   jps_fraqsr = 28            ! fraction of solar net radiation absorbed in the first ocean level
-#if defined key_ww3
    INTEGER, PARAMETER ::   jps_ficet  = 29            ! total ice fraction 
    INTEGER, PARAMETER ::   jps_ocxw   = 30            ! currents on grid 1 
    INTEGER, PARAMETER ::   jps_ocyw   = 31            ! currents on grid 1 
    INTEGER, PARAMETER ::   jpsnd      = 31            ! total number of fields sended
-#else
-   INTEGER, PARAMETER ::   jpsnd      = 28            ! total number of fields sended
-#endif
 
    !                                                         !!** namelist namsbc_cpl **