Changeset 7225 for branches/2016/dev_r6409_SIMPLIF_2_usrdef

Timestamp:

2016-11-15T09:38:52+01:00 (7 years ago)

Author:

flavoni

Message:

#1692 - branch SIMPLIF_2_usrdef: updates: rm jpidta in agrif_user, rm dom_cfg for OFFLINE

Location:

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM

Files:

• NEMO/NST_SRC/agrif_user.F90 (modified) (2 diffs)
• NEMO/OFF_SRC/nemogcm.F90 (modified) (1 diff)
• SETTE/input_ORCA2_LIM_AGRIF.cfg (modified) (1 diff)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

@@ -39 +39 @@
       jpkm1   = jpk-1                                         
       jpij    = jpi*jpj 
-      jpidta  = jpiglo
-      jpjdta  = jpjglo
+ !SF      jpidta  = jpiglo
+ !SF     jpjdta  = jpjglo
       nperio  = 0
       jperio  = 0
@@ -259 +259 @@
 
       ! Check coordinates
-      IF( ln_zps ) THEN
-         ! check parameters for partial steps 
-         IF( Agrif_Parent(e3zps_min) .NE. e3zps_min ) THEN
-            WRITE(*,*) 'incompatible e3zps_min between grids'
-            WRITE(*,*) 'parent grid :',Agrif_Parent(e3zps_min)
-            WRITE(*,*) 'child grid  :',e3zps_min
-            WRITE(*,*) 'those values should be identical'
-            STOP
-         ENDIF
-         IF( Agrif_Parent(e3zps_rat) /= e3zps_rat ) THEN
-            WRITE(*,*) 'incompatible e3zps_rat between grids'
-            WRITE(*,*) 'parent grid :',Agrif_Parent(e3zps_rat)
-            WRITE(*,*) 'child grid  :',e3zps_rat
-            WRITE(*,*) 'those values should be identical'                  
-            STOP
-         ENDIF
-      ENDIF
+     !SF  IF( ln_zps ) THEN
+     !SF     ! check parameters for partial steps 
+     !SF     IF( Agrif_Parent(e3zps_min) .NE. e3zps_min ) THEN
+     !SF        WRITE(*,*) 'incompatible e3zps_min between grids'
+     !SF        WRITE(*,*) 'parent grid :',Agrif_Parent(e3zps_min)
+     !SF        WRITE(*,*) 'child grid  :',e3zps_min
+     !SF        WRITE(*,*) 'those values should be identical'
+     !SF        STOP
+     !SF     ENDIF
+     !SF     IF( Agrif_Parent(e3zps_rat) /= e3zps_rat ) THEN
+     !SF        WRITE(*,*) 'incompatible e3zps_rat between grids'
+     !SF        WRITE(*,*) 'parent grid :',Agrif_Parent(e3zps_rat)
+     !SF        WRITE(*,*) 'child grid  :',e3zps_rat
+     !SF        WRITE(*,*) 'those values should be identical'                  
+     !SF        STOP
+     !SF     ENDIF
+     !SF  ENDIF
 
       ! Check free surface scheme

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

@@ -296 +296 @@
       IF( lk_c1d        )   CALL     c1d_init   ! 1D column configuration
 
-                            !SF CALL     dom_cfg    ! Domain configuration
                             CALL     dom_init   ! Domain
 

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/SETTE/input_ORCA2_LIM_AGRIF.cfg

@@ -1 @@
-ORCA2_LIM_nemo_v3.6.tar ORCA2_LIM_nemo_v3.6
+ORCA2_LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.7