Changeset 2201 for branches/DEV_r1924_nocs_latphys/NEMO/OFF_SRC

Timestamp:

2010-10-11T15:13:35+02:00 (14 years ago)

Author:

acc

Message:

NEMO branch DEV_r1924_nocs_latphys. Merge in trunk chaanges from r1924 to r2200

Location:

branches/DEV_r1924_nocs_latphys/NEMO/OFF_SRC

Files:

• DOM/phycst.F90 (modified) (2 diffs)
• IOM/iom_ioipsl.F90 (modified) (1 diff)
• IOM/iom_nf90.F90 (modified) (1 diff)
• lib_mpp.F90 (modified) (1 diff)

branches/DEV_r1924_nocs_latphys/NEMO/OFF_SRC/DOM/phycst.F90

@@ -37 +37 @@
       rtt      = 273.16_wp  ,  &  !: triple point of temperature (Kelvin)
       rt0      = 273.15_wp  ,  &  !: freezing point of water (Kelvin)
-      rau0     = 1020._wp   ,  &  !: volumic mass of reference (kg/m3)
-      rauw     = 1000._wp   ,  &  !: density of pure water (kg/m3)
+      rau0     = 1035._wp   ,  &  !: volumic mass of reference (kg/m3)
       rcp      =    4.e+3_wp,  &  !: ocean specific heat
       ro0cpr                      !: = 1. / ( rau0 * rcp )
@@ -127 +126 @@
       ro0cpr = 1. / ( rau0 * rcp )
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '          volumic mass of pure water         rauw   = ', rauw, ' kg/m^3'
       IF(lwp) WRITE(numout,*) '          volumic mass of reference          rau0   = ', rau0, ' kg/m^3'
       IF(lwp) WRITE(numout,*) '          ocean specific heat                rcp    = ', rcp

branches/DEV_r1924_nocs_latphys/NEMO/OFF_SRC/IOM/iom_ioipsl.F90

@@ -81 +81 @@
          iln = INDEX( cdname, '.nc' )
          IF( ldwrt ) THEN  ! the file should be open in write mode so we create it...
-            IF( llclobber ) THEN   ;   clstatus = 'REPLACE' 
-            ELSE                   ;   clstatus = 'NEW'
+            IF( llclobber ) THEN   ;   clstatus = 'REPLACE 64' 
+            ELSE                   ;   clstatus = 'NEW 64'
             ENDIF
             IF( jpnij > 1 ) THEN

branches/DEV_r1924_nocs_latphys/NEMO/OFF_SRC/IOM/iom_nf90.F90

@@ -94 +94 @@
             IF(lwp) WRITE(numout,*) TRIM(clinfo)//' create new file: '//TRIM(cdname)//' in WRITE mode'
 
-            IF( llclobber ) THEN   ;   imode = NF90_CLOBBER 
-            ELSE                   ;   imode = NF90_NOCLOBBER 
+            IF( llclobber ) THEN   ;   imode = IOR( NF90_64BIT_OFFSET, NF90_CLOBBER   )
+            ELSE                   ;   imode = IOR( NF90_64BIT_OFFSET, NF90_NOCLOBBER ) 
             ENDIF
             CALL iom_nf90_check(NF90_CREATE( TRIM(cdname), imode, if90id, chunksize = ichunk ), clinfo)

branches/DEV_r1924_nocs_latphys/NEMO/OFF_SRC/lib_mpp.F90

@@ -105 +105 @@
    !! ========================= !!
 !$AGRIF_DO_NOT_TREAT
-#  include <mpif.h>
+   INCLUDE mpif.h
 !$AGRIF_END_DO_NOT_TREAT