Changeset 3884 for branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DIA

Timestamp:

2013-04-22T13:25:29+02:00 (11 years ago)

Author:

acc

Message:

Branch 2013/dev_r3858_NOC_ZTC, #863. Correction to sst2 and sss3 terms in diawri.F90 and code tidying in domvvl.F90 with added support for other ORCA grids

File:

• branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) (1 diff)

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -146 +146 @@
          CALL iom_put( "toce" , z3d                        )   ! heat content
          CALL iom_put( "sst"  , z3d(:,:,1)                 )   ! sea surface heat content
-         CALL iom_put( "sst2" , z3d(:,:,1) * z3d(:,:,1)    )   ! sea surface content of squared temperature
+         z3d(:,:,1) = tsn(:,:,1,jp_tem) * z3d(:,:,1)
+         CALL iom_put( "sst2" , z3d(:,:,1)                 )   ! sea surface content of squared temperature
          z3d(:,:,:) = tsn(:,:,:,jp_sal) * fse3t_n(:,:,:)            
          CALL iom_put( "soce" , z3d                        )   ! salinity content
          CALL iom_put( "sss"  , z3d(:,:,1)                 )   ! sea surface salinity content
-         CALL iom_put( "sss2" , z3d(:,:,1) * z3d(:,:,1)    )   ! sea surface content of squared salinity
+         z3d(:,:,1) = tsn(:,:,1,jp_sal) * z3d(:,:,1)
+         CALL iom_put( "sss2" , z3d(:,:,1)                 )   ! sea surface content of squared salinity
       ELSE
          CALL iom_put( "toce" , tsn(:,:,:,jp_tem)          )   ! temperature