Changeset 65 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

Timestamp:

01/02/13 18:50:00 (12 years ago)

Author:

smasson

Message:

bugfix for agrf, obc and xios

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (8 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -25 +25 @@
    !!   cpl_prism_finalize : finalize the coupled mode communication
    !!----------------------------------------------------------------------
+#if defined key_oasis_mct
+   USE mod_prism
+#else
    USE mod_prism_proto              ! OASIS3 prism module
    USE mod_prism_def_partition_proto! OASIS3 prism module for partitioning
@@ -30 +33 @@
    USE mod_prism_get_proto          ! OASIS3 prism module for receiving
    USE mod_comprism_proto           ! OASIS3 prism module to get coupling frequency
+#endif
    USE par_oce                      ! ocean parameters
    USE dom_oce                      ! ocean space and time domain
@@ -51 +55 @@
    INTEGER                    ::   nerror            ! return error code
 
-   INTEGER, PARAMETER ::   nmaxfld=40    ! Maximum number of coupling fields
+   INTEGER, PUBLIC, PARAMETER ::   nmaxfld=40    ! Maximum number of coupling fields
    
    TYPE, PUBLIC ::   FLD_CPL               !: Type for coupling field information
@@ -62 +66 @@
    END TYPE FLD_CPL
 
-   TYPE(FLD_CPL), DIMENSION(nmaxfld), PUBLIC ::   srcv, ssnd   !: Coupling fields
+   TYPE(FLD_CPL), DIMENSION(:), ALLOCATABLE, PUBLIC ::   srcv, ssnd   !: Coupling fields
 
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   exfld   ! Temporary buffer for receiving
@@ -87 +91 @@
       ! WARNING: No write in numout in this routine
       !============================================
-
       !------------------------------------------------------------------
       ! 1st Initialize the PRISM system for the application
@@ -194 +197 @@
                   zclname=srcv(ji)%clname
                ENDIF
+#if defined key_agrif
+               IF( agrif_fixed() /= 0 ) THEN 
+                  zclname=TRIM(Agrif_CFixed())//zclname(2:8)
+               END IF
+#endif
                IF( ln_ctl ) WRITE(numout,*) "Define",ji,jc,zclname," for",PRISM_In
                CALL prism_def_var_proto ( srcv(ji)%nid(jc), zclname, id_part, (/ 2, 0/),   &
@@ -208 +216 @@
       ! End of definition phase
       !------------------------------------------------------------------
-      
-      CALL prism_enddef_proto(nerror)
-      IF( nerror /= PRISM_Ok )   CALL prism_abort_proto ( ncomp_id, 'cpl_prism_define', 'Failure in prism_enddef')
-      !
+#if defined key_agrif
+!!$      IF( agrif_fixed() == agrif_nb_fixed_grids() ) THEN 
+      IF( .NOT. Agrif_Root() ) THEN
+#endif
+         WRITE(numout,*) 'before prism_enddef_proto'
+         CALL FLUSH(numout)
+
+         CALL prism_enddef_proto(nerror)
+         IF( nerror /= PRISM_Ok )   CALL prism_abort_proto ( ncomp_id, 'cpl_prism_define', 'Failure in prism_enddef')
+      !
+         WRITE(numout,*) 'after prism_enddef_proto'
+         CALL FLUSH(numout)
+#if defined key_agrif
+      ENDIF
+#endif
+
    END SUBROUTINE cpl_prism_define
    
@@ -322 +342 @@
       INTEGER,INTENT(in) ::   kid   ! variable index 
       !!----------------------------------------------------------------------
-      cpl_prism_freq = ig_def_freq( kid )
+!EM OASIS-MCT info not yet available on official distrib
+!      cpl_prism_freq = ig_def_freq( kid )
+      cpl_prism_freq = 300
       !
    END FUNCTION cpl_prism_freq