Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90 (modified) (3 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -8 +8 @@
    !!            9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
    !!----------------------------------------------------------------------
-#if (  defined key_orca_r1 || defined key_orca_r2 || defined  key_orca_r4 ) && ! defined key_coupled
-   !!----------------------------------------------------------------------
-   !!   "key_orca_r1 or 2 or 4"
+#if ! defined key_coupled
+ 
+   !!----------------------------------------------------------------------
+   !!   Only for ORCA2 ORCA1 and ORCA025
    !!----------------------------------------------------------------------
    !!----------------------------------------------------------------------
@@ -61 +62 @@
       REAL(wp) ::  zt, zs, zu  
       REAL(wp) ::  zsm0, zfwfnew
+      IF( cp_cfg == "orca" .AND. jp_cfg == 1 .OR. jp_cfg == 2 .OR. jp_cfg == 4 ) THEN
       !!----------------------------------------------------------------------
       IF( nn_timing == 1 )   CALL timing_start('dia_fwb')
@@ -446 +448 @@
  9020 FORMAT(1X,A,F10.5,A)
  9030 FORMAT(1X,A,F9.4,A)
+  
+      ENDIF 
 
    END SUBROUTINE dia_fwb