Changeset 5282 for branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/TOOLS

Timestamp:

2015-05-18T17:19:50+02:00 (9 years ago)

Author:

diovino

Message:

Dev. branch CMCC4_simplification ticket #1456

Location:

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/TOOLS

Files:

• COMPILE/full_key_list.txt (added)
• COMPILE/tools.txt (modified) (1 diff)
• NESTING/src/agrif_create_restart.f90 (modified) (2 diffs)
• OBSTOOLS/src/in_out_manager.F90 (modified) (1 diff)
• SIREN/cfg/variable.cfg (modified) (1 diff)
• SIREN/src/vgrid.f90 (modified) (2 diffs)

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/TOOLS/COMPILE/tools.txt

@@ -1 @@
-REBUILD 
+REBUILD_NEMO 

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/TOOLS/NESTING/src/agrif_create_restart.f90

@@ -411 +411 @@
         ENDIF
         !
-     CASE('nfice','nfbulk','kt','ndastp','adatrj','rdt','rdttra1') 
+     CASE('nfice','nfbulk','kt','ndastp','adatrj','rdt') 
         IF(.NOT. dimg ) THEN
            WRITE(*,*) 'copy ',TRIM(Ncdf_varname(i))
@@ -417 +417 @@
               CALL Read_Ncdf_var(TRIM(Ncdf_varname(i)),TRIM(restart_file),tabtemp0dreal)  
               SELECT CASE (TRIM(Ncdf_varname(i)))
-              CASE('rdt','rdttra1')
+              CASE('rdt')
                  tabtemp0dreal = tabtemp0dreal/rhot
               CASE('kt')

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/TOOLS/OBSTOOLS/src/in_out_manager.F90

@@ -37 +37 @@
    INTEGER       ::   nn_write      =   10        !: model standard output frequency
    INTEGER       ::   nn_stock      =   10        !: restart file frequency
-   LOGICAL       ::   ln_dimgnnn    = .FALSE.     !: type of dimgout. (F): 1 file for all proc
-                                                       !:                  (T): 1 file per proc
    LOGICAL       ::   ln_mskland    = .FALSE.     !: mask land points in NetCDF outputs (costly: + ~15%)
    LOGICAL       ::   ln_clobber    = .FALSE.     !: clobber (overwrite) an existing file

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/TOOLS/SIREN/cfg/variable.cfg

@@ -41 +41 @@
 kt           |                |      |   |                                  |                    |               
 rdt          |                |      |   |                                  |                    |               
-rdttra1      |                |      |   |                                  |                    |               
 utau_b       |                | XYT  | U |surface_downward_eastward_stress  |                    |               
 vtau_b       |                | XYT  | V |surface_downward_northward_stress |                    |               

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/TOOLS/SIREN/src/vgrid.f90

@@ -229 +229 @@
             dd_gdepw(jk) = ( dl_zw - 1.0 ) * dl_za1
             dd_gdept(jk) = ( dl_zt - 1.0 ) * dl_za1
-            dd_e3w  (jk) =  dl_za1
-            dd_e3t  (jk) =  dl_za1
+            dd_e3w(jk) =  dl_za1
+            dd_e3t(jk) =  dl_za1
          END DO
 
@@ -244 +244 @@
             &                dl_za1 * dl_zacr * LOG( COSH( (dl_zt-dl_zkth)/dl_zacr ) ) + &
             &                dl_za2 * dl_zacr2* LOG( COSH( (dl_zt-dl_zkth2)/dl_zacr2 ) ) )
-            dd_e3w  (jk) =             dl_za0 + &
+            dd_e3w(jk) =             dl_za0 + &
             &                          dl_za1 * TANH(      (dl_zw-dl_zkth)/dl_zacr   ) + &
             &                          dl_za2 * TANH(      (dl_zw-dl_zkth2)/dl_zacr2 )
-            dd_e3t  (jk) =             dl_za0 + &
+            dd_e3t(jk) =             dl_za0 + &
             &                          dl_za1 * TANH(      (dl_zt-dl_zkth)/dl_zacr   ) + &
             &                          dl_za2 * TANH(      (dl_zt-dl_zkth2)/dl_zacr2 )