Changeset 389 for trunk/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2006-03-09T18:22:04+01:00 (18 years ago)

Author:

opalod

Message:

RB:nemo_v1_update_038: first integration of Agrif :

• configuration parameters are just integer when agrif is used
• add call to agrif routines with key_agrif

File:

• trunk/NEMO/OPA_SRC/DOM/domain.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/DOM/domain.F90

@@ -97 +97 @@
       hu(:,:) = 0.
       hv(:,:) = 0.
+
       DO jk = 1, jpk
          hu(:,:) = hu(:,:) + fse3u(:,:,jk) * umask(:,:,jk)
@@ -104 +105 @@
       hur(:,:) = fse3u(:,:,1)             ! Lower bound : thickness of the first model level
       hvr(:,:) = fse3v(:,:,1)
+      
       DO jk = 2, jpk                      ! Sum of the vertical scale factors
          hur(:,:) = hur(:,:) + fse3u(:,:,jk) * umask(:,:,jk)
          hvr(:,:) = hvr(:,:) + fse3v(:,:,jk) * vmask(:,:,jk)
       END DO
+
       ! Compute and mask the inverse of the local depth
       hur(:,:) = 1. / hur(:,:) * umask(:,:,1)
@@ -137 +140 @@
       !! * Modules used
       USE ioipsl
-      NAMELIST/namrun/ no    , cexper   , ln_rstart , nrstdt , nit000,          &
-         &             nitend, ndate0   , nleapy   , ninist , nstock,           &
+      NAMELIST/namrun/ no    , cexper   , ln_rstart , nrstdt , nit000,         &
+         &             nitend, ndate0   , nleapy   , ninist , nstock,          &
          &             nprint, nwrite   , nrunoff  , ln_ctl , nictls, nictle,   &
          &             njctls, njctle   , nbench   , isplt  , jsplt
@@ -261 +264 @@
       ENDIF
 
+#if defined key_AGRIF
+      if ( Agrif_Root() ) then
+#endif
       SELECT CASE ( nleapy )   ! Choose calendar for IOIPSL
       CASE (  1 ) 
@@ -272 +278 @@
          IF(lwp) WRITE(numout,*) '           The IOIPSL calendar is "360d", i.e. 360 days in a year'
       END SELECT
+#if defined key_AGRIF
+      endif
+#endif
 
       SELECT CASE ( nleapy )   ! year=raajj*days day=rjjhh*hours hour=rhhmm*minutes etc ...