Changeset 2561 for trunk/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2011-01-17T17:22:58+01:00 (13 years ago)

Author:

cetlod

Message:

Suppression of special characters in the name of output variables & check consistency with iodef.xml

Location:

trunk/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diahth.F90 (modified) (1 diff)
• DIA/diawri.F90 (modified) (1 diff)
• SBC/sbcmod.F90 (modified) (1 diff)
• TRA/traadv.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90

@@ -202 +202 @@
       END DO
 
-      CALL iom_put( "mld|dt|" , zabs2        )   ! MLD abs(delta t) - 0.2
+      CALL iom_put( "mld_dt02", zabs2        )   ! MLD abs(delta t) - 0.2
       CALL iom_put( "topthdep", ztm2         )   ! T(10) - 0.2
       CALL iom_put( "mldr10_3", zrho10_3     )   ! MLD delta rho(10m) = 0.03

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -137 +137 @@
       END DO
       CALL lbc_lnk( z2d, 'T', 1. )
-      CALL iom_put( "|sstgrad|2",  z2d               )    ! square of module of sst gradient
+      CALL iom_put( "sstgrad2",  z2d               )    ! square of module of sst gradient
 !CDIR NOVERRCHK
       z2d(:,:) = SQRT( z2d(:,:) )
-      CALL iom_put( "|sstgrad|" ,  z2d               )    ! module of sst gradient
+      CALL iom_put( "sstgrad" ,  z2d               )    ! module of sst gradient
 
       IF( lk_diaar5 ) THEN

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -306 +306 @@
       !                                                ! ---------------------------------------- !
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
-         CALL iom_put( "emp-rnf" , emp  - rnf )                   ! upward water flux
-         CALL iom_put( "emps-rnf", emps - rnf )                   ! c/d water flux
-         CALL iom_put( "qns+qsr" , qns  + qsr )                   ! total heat flux 
-         CALL iom_put( "qns"     , qns        )                   ! solar heat flux
-         CALL iom_put( "qsr"     ,       qsr  )                   ! solar heat flux
+         CALL iom_put( "empmr" , emp  - rnf )                   ! upward water flux
+         CALL iom_put( "empsmr", emps - rnf )                   ! c/d water flux
+         CALL iom_put( "qt"    , qns  + qsr )                   ! total heat flux 
+         CALL iom_put( "qns"   , qns        )                   ! solar heat flux
+         CALL iom_put( "qsr"   ,       qsr  )                   ! solar heat flux
          IF( nn_ice > 0 )   CALL iom_put( "ice_cover", fr_i )   ! ice fraction 
       ENDIF

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

@@ -90 +90 @@
          &              CALL tra_adv_eiv( kt, zun, zvn, zwn, 'TRA' )          ! add the eiv transport (if necessary)
       !
-      CALL iom_put( "uoce_eff", zun )                                         ! output effective transport      
-      CALL iom_put( "voce_eff", zvn )
-      CALL iom_put( "woce_eff", zwn )
+      CALL iom_put( "uocetr_eff", zun )                                         ! output effective transport      
+      CALL iom_put( "vocetr_eff", zvn )
+      CALL iom_put( "wocetr_eff", zwn )
 
       SELECT CASE ( nadv )                            !==  compute advection trend and add it to general trend  ==!