Changeset 389 for trunk/NEMO/OPA_SRC/DTA

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

Location:

trunk/NEMO/OPA_SRC/DTA

Files:

• dtasal.F90 (modified) (2 diffs)
• dtasst.F90 (modified) (1 diff)
• dtatem.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -121 +121 @@
          
          clname = 'data_1m_salinity_nomask'
+#if defined key_AGRIF
+         if ( .NOT. Agrif_Root() ) then
+            clname = TRIM(Agrif_CFixed())//'_'//TRIM(clname)
+         endif
+#endif          
          CALL flinopen(TRIM(clname),mig(1),nlci,mjg(1),nlcj,.FALSE.   &
               ,ipi,ipj,ipk,zlon,zlat,zlev,itime,istep,zdate0,rdt,numsdt)
@@ -270 +275 @@
             WRITE(numout,*)
             WRITE(numout,*) ' Levitus month = ',nsal1,'  level = 1'
-            CALL prihre(saldta(1,1,1,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout)
+            CALL prihre(saldta(:,:,1,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout)
             WRITE(numout,*) ' Levitus month = ',nsal1,'  level = ',jpk/2
-            CALL prihre(saldta(1,1,jpk/2,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout)
+            CALL prihre(saldta(:,:,jpk/2,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout)
             WRITE(numout,*) ' Levitus month = ',nsal1,'  level = ',jpkm1
-            CALL prihre(saldta(1,1,jpkm1,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout)
+            CALL prihre(saldta(:,:,jpkm1,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout)
          ENDIF
       ENDIF

trunk/NEMO/OPA_SRC/DTA/dtasst.F90

@@ -91 +91 @@
       REAL(wp) ::   zlon(jpi,jpj), zlat(jpi,jpj), zlev(jpk)
       CHARACTER (len=45) ::   &
-         clname = "sst_1d.nc"      ! filename for daily SST
+         clname       ! filename for daily SST
       !!----------------------------------------------------------------------
-
+         clname = 'sst_1d.nc'
+#if defined key_AGRIF
+      if ( .NOT. Agrif_Root() ) then
+         clname = TRIM(Agrif_CFixed())//'_'//TRIM(clname)
+      endif
+#endif         
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)

trunk/NEMO/OPA_SRC/DTA/dtatem.F90

@@ -28 +28 @@
 
    !! * Module variables
-   CHARACTER (len=38) ::   &
-      cl_tdata = 'data_1m_potential_temperature_nomask '
+   CHARACTER (len=45) ::   &
+      cl_tdata
    INTEGER ::   &
       nlecte =  0,   &  ! switch for the first read
@@ -98 +98 @@
       !!----------------------------------------------------------------------
 
+      cl_tdata = 'data_1m_potential_temperature_nomask '
+
+#if defined key_AGRIF
+      if ( .NOT. Agrif_Root() ) then
+         cl_tdata = TRIM(Agrif_CFixed())//'_'//TRIM(cl_tdata)
+      endif
+#endif         
 
       ! 0. Initialization
@@ -262 +269 @@
             WRITE(numout,*)
             WRITE(numout,*) ' Levitus month = ', ntem1, '  level = 1'
-            CALL prihre( temdta(1,1,1,1), jpi, jpj, 1, jpi, 20, 1, jpj, 20, 1., numout )
+            CALL prihre( temdta(:,:,1,1), jpi, jpj, 1, jpi, 20, 1, jpj, 20, 1., numout )
             WRITE(numout,*) ' Levitus month = ', ntem1, '  level = ', jpk/2
-            CALL prihre( temdta(1,1,jpk/2,1), jpi, jpj, 1, jpi, 20, 1, jpj, 20, 1., numout )
+            CALL prihre( temdta(:,:,jpk/2,1), jpi, jpj, 1, jpi, 20, 1, jpj, 20, 1., numout )
             WRITE(numout,*) ' Levitus month = ',ntem1,'  level = ', jpkm1
-            CALL prihre( temdta(1,1,jpkm1,1), jpi, jpj, 1, jpi, 20, 1, jpj, 20, 1., numout )
+            CALL prihre( temdta(:,:,jpkm1,1), jpi, jpj, 1, jpi, 20, 1, jpj, 20, 1., numout )
          ENDIF
       ENDIF