Changeset 392 for trunk/NEMO/OPA_SRC/DOM

Timestamp:

2006-03-10T11:55:45+01:00 (18 years ago)

Author:

opalod

Message:

RB:nemo_v1_update_038: first integration of Agrif :

• add agrif to dynspg_flt_jki.F90
• cosmetic change of key_AGRIF in key_agrif

Location:

trunk/NEMO/OPA_SRC/DOM

Files:

• dom_oce.F90 (modified) (1 diff)
• domain.F90 (modified) (2 diffs)
• domhgr.F90 (modified) (3 diffs)
• domwri.F90 (modified) (1 diff)
• domzgr.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -197 +197 @@
       !                        ! parameterize exchanges through straits
 
-#if defined key_AGRIF
+#if defined key_agrif
    !!----------------------------------------------------------------------
    !! agrif sponge layer

trunk/NEMO/OPA_SRC/DOM/domain.F90

@@ -264 +264 @@
       ENDIF
 
-#if defined key_AGRIF
+#if defined key_agrif
       if ( Agrif_Root() ) then
 #endif
@@ -278 +278 @@
          IF(lwp) WRITE(numout,*) '           The IOIPSL calendar is "360d", i.e. 360 days in a year'
       END SELECT
-#if defined key_AGRIF
+#if defined key_agrif
       endif
 #endif

trunk/NEMO/OPA_SRC/DOM/domhgr.F90

@@ -236 +236 @@
          gphi0 = - ppe2_m * 1.e-3
          
-#if defined key_AGRIF && defined key_eel_r6
+#if defined key_agrif && defined key_eel_r6
          IF (.Not.Agrif_Root()) THEN
            glam0  = Agrif_Parent(glam0) + (Agrif_ix())*Agrif_Parent(ppe1_m) * 1.e-3
@@ -434 +434 @@
          zphi0   = ppgphi0 - FLOAT( jpjglo/2) * ppe2_m / ( ra * rad )           ! latitude of the first row F-points
          
-#if defined key_AGRIF && defined key_eel_r6
+#if defined key_agrif && defined key_eel_r6
          IF (.Not.Agrif_Root()) THEN
            zphi0 = ppgphi0 - FLOAT( Agrif_Parent(jpjglo)/2)*Agrif_Parent(ppe2_m) / (ra * rad)
@@ -513 +513 @@
       !!----------------------------------------------------------------------
       clname = 'coordinates'
-#if defined key_AGRIF
+#if defined key_agrif
       if ( .NOT. Agrif_Root() ) then
          clname = TRIM(Agrif_CFixed())//'_'//TRIM(clname)

trunk/NEMO/OPA_SRC/DOM/domwri.F90

@@ -104 +104 @@
          clnam4 = 'mesh_zgr'   ! filename (vertical   mesh informations)
 
-#if defined key_AGRIF
+#if defined key_agrif
       if ( .NOT. Agrif_Root() ) then
         clnam0 = TRIM(Agrif_CFixed())//'_'//TRIM(clnam0)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -391 +391 @@
 
          clname = 'bathy_level.nc'                       ! Level bathymetry
-#if defined key_AGRIF
+#if defined key_agrif
       if ( .NOT. Agrif_Root() ) then
          clname = TRIM(Agrif_CFixed())//'_'//TRIM(clname)
@@ -420 +420 @@
 
          clname = 'bathy_meter.nc'                       ! meter bathymetry
-#if defined key_AGRIF
+#if defined key_agrif
       if ( .NOT. Agrif_Root() ) then
          clname = TRIM(Agrif_CFixed())//'_'//TRIM(clname)