Changeset 2676 for branches

Timestamp:

2011-03-09T13:00:11+01:00 (13 years ago)

Author:

rblod

Message:

Second set of change in OPA_SRC for compatibility with agrif

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (2 diffs)
• DYN/dynspg.F90 (modified) (1 diff)
• SBC/sbcmod.F90 (modified) (1 diff)
• SBC/sbcrnf.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (1 diff)
• par_oce.F90 (modified) (2 diffs)
• step.F90 (modified) (1 diff)
• wrk_nemo.F90 (modified) (5 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -539 +539 @@
       CALL histwrite( nid_T, "sohefldp", it, qrp           , ndim_hT, ndex_hT )   ! heat flux damping
       CALL histwrite( nid_T, "sowafldp", it, erp           , ndim_hT, ndex_hT )   ! freshwater flux damping
-      zw2d(:,:) = erp(:,:) * sn(:,:,1) * tmask(:,:,1)
+      IF( ln_ssr ) zw2d(:,:) = erp(:,:) * sn(:,:,1) * tmask(:,:,1)
       CALL histwrite( nid_T, "sosafldp", it, zw2d          , ndim_hT, ndex_hT )   ! salt flux damping
 #endif
@@ -545 +545 @@
       CALL histwrite( nid_T, "sohefldp", it, qrp           , ndim_hT, ndex_hT )   ! heat flux damping
       CALL histwrite( nid_T, "sowafldp", it, erp           , ndim_hT, ndex_hT )   ! freshwater flux damping
-         zw2d(:,:) = erp(:,:) * sn(:,:,1) * tmask(:,:,1)
+         IF( ln_ssr ) zw2d(:,:) = erp(:,:) * sn(:,:,1) * tmask(:,:,1)
       CALL histwrite( nid_T, "sosafldp", it, zw2d          , ndim_hT, ndex_hT )   ! salt flux damping
 #endif

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -205 +205 @@
       ENDIF
 
-      IF( nspg == 2 .OR. nspg == -1 ) CALL solver_init( nit000 )   ! Elliptic solver initialisation
+#if defined key_dynspg_flt || defined key_esopa
+      CALL solver_init( nit000 )   ! Elliptic solver initialisation
+#endif
 
       !                        ! Control of timestep choice

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -125 +125 @@
       IF( .NOT. ln_rnf ) THEN                      ! no specific treatment in vicinity of river mouths 
          ln_rnf_mouth  = .false.                      
+         IF( sbc_rnf_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_init : unable to allocate sbc_rnf arrays' )
          nkrnf         = 0
          rnf     (:,:) = 0.e0

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -31 +31 @@
    PUBLIC   sbc_rnf       ! routine call in sbcmod module
    PUBLIC   sbc_rnf_div   ! routine called in sshwzv module
+   PUBLIC   sbc_rnf_alloc ! routine call in sbcmod module
 
    !                                                     !!* namsbc_rnf namelist *

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -114 +114 @@
       !                            !-----------------------!
 #if defined key_agrif
-      CALL Agrif_Declare_Variables()      ! AGRIF: set the meshes
+      CALL Agrif_Declare_Var       ! AGRIF: set the meshes
+# if defined key_top
+      CALL Agrif_Declare_Var_Top   ! AGRIF: set the meshes
+# endif
 #endif
       ! check that all process are still there... If some process have an error,

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/par_oce.F90

@@ -168 +168 @@
    INTEGER, PUBLIC            ::   nbcellsy     = jpjglo - 2 - 2*nbghostcells   !: number of cells in j-direction
    !
-#else
+#endif
    INTEGER, PUBLIC  ::   jpi   ! = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   !: first  dimension
    INTEGER, PUBLIC  ::   jpj   ! = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   !: second dimension
@@ -176 +176 @@
    INTEGER, PUBLIC  ::   jpkm1 ! = jpk-1                                            !:   -     -      -
    INTEGER, PUBLIC  ::   jpij  ! = jpi*jpj                                          !:  jpi x jpj
-#endif
 
    !!---------------------------------------------------------------------

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -81 +81 @@
 #if defined key_agrif
       kstp = nit000 + Agrif_Nb_Step()
+!      IF ( Agrif_Root() .and. lwp) Write(*,*) '---'
+!      IF (lwp) Write(*,*) 'Grid Number',Agrif_Fixed(),' time step ',kstp
 # if defined key_iomput
       IF( Agrif_Nbstepint() == 0 )   CALL iom_swap

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

@@ -101 +101 @@
    LOGICAL :: llwp    ! Local copy of lwp - whether we are master PE or not
 
-   CHARACTER(LEN=*), PARAMETER ::   cform_err = "(/,' ===>>> : E R R O R',     /,'         ===========',/)"       !:
-   CHARACTER(LEN=*), PARAMETER ::   cform_war = "(/,' ===>>> : W A R N I N G', /,'         ===============',/)"   !:
+   CHARACTER(LEN=*), PARAMETER ::   cform_err2 = "(/,' ===>>> : E R R O R',     /,'         ===========',/)"       !:
+   CHARACTER(LEN=*), PARAMETER ::   cform_war2 = "(/,' ===>>> : W A R N I N G', /,'         ===============',/)"   !:
 
    !!----------------------------------------------------------------------
@@ -193 +193 @@
       ! appropriate action - we just print a warning message
       IF( wrk_alloc /= 0 ) THEN
-         WRITE(kumout,cform_war)
+         WRITE(kumout,cform_war2)
          WRITE(kumout,*) 'wrk_alloc: allocation of workspace arrays failed'
       END IF
@@ -228 +228 @@
       wrk_in_use = .FALSE.
       
-#if ! defined   key_no_workspace_check
+#if ! defined   key_no_workspace_check || ! defined key_agrif
       iptr    = index1
       iarg    = 1
@@ -326 +326 @@
       llwrk_in_use = .FALSE.
       !
-#if ! defined   key_no_workspace_check
+#if ! defined   key_no_workspace_check || ! defined key_agrif
       !
       iptr      = index1
@@ -992 +992 @@
       !!----------------------------------------------------------------------
 
-      WRITE(kumout, cform_err)
+      WRITE(kumout, cform_err2)
       WRITE(kumout,*) TRIM(cmsg)
       ! ARPDBG - would like to call mppstop here to force a stop but that