Changeset 6096

Timestamp:

2015-12-17T15:49:53+01:00 (8 years ago)

Author:

timgraham

Message:

Minor fixes for AGRIF as in ticket #1577

Location:

branches/2015/dev_agrif_v3_6_STABLE/NEMOGCM

Files:

• CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) (1 diff)
• CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) (2 diffs)
• NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) (1 diff)
• NEMO/OPA_SRC/TRA/traadv_eiv.F90 (modified) (1 diff)
• NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90 (modified) (1 diff)
• SETTE/prepare_exe_dir.sh (modified) (1 diff)

branches/2015/dev_agrif_v3_6_STABLE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg

@@ -6 +6 @@
 !-----------------------------------------------------------------------
    cn_exp      = "Agulhas" !  experience name 
-   nn_itend    =     480   !  last  time step
+   nn_itend    =   10950   !  last  time step
    nn_stock    =   10950   !  frequency of creation of a restart file (modulo referenced to 1)
    nn_write    =   10950   !  frequency of write in the output file   (modulo referenced to nn_it000)

branches/2015/dev_agrif_v3_6_STABLE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml

@@ -205 +205 @@
 
    <file id="file3" name_suffix="_grid_U" description="ocean U grid variables" >
-     <field field_ref="suoce"        name="uos"     long_name="sea_surface_x_velocity"    />
+     <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    />
      <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      />
      <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
@@ -214 +214 @@
    
    <file id="file4" name_suffix="_grid_V" description="ocean V grid variables" >
-     <field field_ref="svoce"        name="vos"     long_name="sea_surface_y_velocity"    />
+     <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    />
      <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"      />
      <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />

branches/2015/dev_agrif_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

@@ -53 +53 @@
    REAL(wp)   , PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:)     ::  risfLeff               !:effective length (Leff) BG03 nn_isf==2
    REAL(wp)   , PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:)     ::  ttbl, stbl, utbl, vtbl !:top boundary layer variable at T point
-#if defined key_agrif
-   ! AGRIF can not handle these arrays as integers. The reason is a mystery but problems avoided by declaring them as reals
-   REAL(wp),    PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:)     ::  misfkt, misfkb         !:Level of ice shelf base
-                                                                                          !: (first wet level and last level include in the tbl)
-#else
    INTEGER,    PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:)     ::  misfkt, misfkb         !:Level of ice shelf base
-#endif
 
 

branches/2015/dev_agrif_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90

@@ -212 +212 @@
       CHARACTER(len=3) ::   cdtype
       REAL, DIMENSION(:,:,:) ::   pun, pvn, pwn
-      WRITE(*,*) 'tra_adv_eiv: You should not have seen this print! error?', kt, cdtype, pun(1,1,1), pvn(1,1,1), pwn(1,1,1)
+      WRITE(*,*) 'tra_adv_eiv: You should not have seen this print! error?', &
+          &  kt, cdtype, pun(1,1,1), pvn(1,1,1), pwn(1,1,1)
    END SUBROUTINE tra_adv_eiv
 #endif

branches/2015/dev_agrif_v3_6_STABLE/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90

@@ -84 +84 @@
 
    !!======================================================================
-END MODULE  p2zsms
+END MODULE p2zsms

branches/2015/dev_agrif_v3_6_STABLE/NEMOGCM/SETTE/prepare_exe_dir.sh

@@ -70 +70 @@
 export EXE_DIR=${CONFIG_DIR}/${NEW_CONF}/${TEST_NAME}
 
-cp -r ${CONFIG_DIR}/${NEW_CONF}/EXP00/* ${EXE_DIR}/.
+cp -rL ${CONFIG_DIR}/${NEW_CONF}/EXP00/* ${EXE_DIR}/.
 cp -r ${SETTE_DIR}/iodef_sette.xml ${EXE_DIR}/iodef.xml
 cd ${EXE_DIR}