Changeset 4231

Timestamp:

2013-11-18T12:58:12+01:00 (10 years ago)

Author:

cbricaud

Message:

correct some bugs in UKMO_MERCATOR 2013 branch

Location:

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM

Files:

• CONFIG/cfg.txt (modified) (2 diffs)
• NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (1 diff)
• NEMO/OPA_SRC/par_C1D_PAPA.h90 (modified) (1 diff)

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/cfg.txt

@@ -1 @@
-AMM12 OPA_SRC
 GYRE OPA_SRC
 GYRE_BFM OPA_SRC TOP_SRC
@@ -6 +5 @@
 ORCA2_SAS_LIM OPA_SRC SAS_SRC LIM_SRC_2 NST_SRC
 ORCA2_LIM_CFC_C14b OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
-ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
 ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
+C1D_PAPA OPA_SRC
+ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
+AMM12 OPA_SRC

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1116 +1116 @@
       INTEGER  ::   iip1, ijp1, iim1, ijm1   ! temporary integers
       REAL(wp) ::   zrmax, ztaper   ! temporary scalars
-      !
+      REAL(wp) ::   zrfact
+      !
+      REAL(wp), POINTER, DIMENSION(:,:  ) :: ztmpi1, ztmpi2, ztmpj1, ztmpj2
       REAL(wp), POINTER, DIMENSION(:,:  ) :: zenv, ztmp, zmsk, zri, zrj, zhbat
 

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/par_C1D_PAPA.h90

@@ -29 +29 @@
       jpiglo  = jpidta,      &  !: first  dimension of global domain --> i
       jpjglo  = jpjdta,      &  !: second dimension of global domain --> j
+      ! Domain characteristics
+      jperio  =    0            !: lateral cond. type (between 0 and 6)
+
+   INTEGER  ::   &
       ! starting position of the zoom
       jpizoom =   1   ,      &  !: left bottom (i,j) indices of the zoom
-      jpjzoom =   1   ,      &  !: in data indices
-      ! Domain characteristics
-      jperio  =    0            !: lateral cond. type (between 0 and 6)
+      jpjzoom =   1             !: in data indices
 
    !!  Values set to pp_not_used indicates that this parameter is not used in THIS config.