Changeset 13145

Timestamp:

2020-06-23T13:51:37+02:00 (3 years ago)

Author:

rblod

Message:

ticket #2129 : compilation issues in Domaincfg

Location:

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src

Files:

• agrif_dom_update.F90 (modified) (1 diff)
• lib_mpp.F90 (modified) (2 diffs)
• mpp_nfd_generic.h90 (modified) (1 diff)

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_dom_update.F90

@@ -5 +5 @@
    USE agrif_parameters
    USE agrif_profiles
+   USE lbclnk
    
    IMPLICIT none

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/lib_mpp.F90

@@ -1529 +1529 @@
       ENDIF
    END SUBROUTINE mpp_report
-
-   
-   SUBROUTINE tic_tac (ld_tic, ld_global)
-
-    LOGICAL,           INTENT(IN) :: ld_tic
-    LOGICAL, OPTIONAL, INTENT(IN) :: ld_global
-    REAL(wp), DIMENSION(2), SAVE :: tic_wt
-    REAL(wp),               SAVE :: tic_ct = 0._wp
-    INTEGER :: ii
-
-    IF( ncom_stp <= nit000 ) RETURN
-    IF( ncom_stp == nitend ) RETURN
-    ii = 1
-    IF( PRESENT( ld_global ) ) THEN
-       IF( ld_global ) ii = 2
-    END IF
-    
-    IF ( ld_tic ) THEN
-       tic_wt(ii) = MPI_Wtime()                                                    ! start count tic->tac (waiting time)
-       IF ( tic_ct > 0.0_wp ) compute_time = compute_time + MPI_Wtime() - tic_ct   ! cumulate count tac->tic
-    ELSE
-       waiting_time(ii) = waiting_time(ii) + MPI_Wtime() - tic_wt(ii)              ! cumulate count tic->tac
-       tic_ct = MPI_Wtime()                                                        ! start count tac->tic (waiting time)
-    ENDIF
-    
-   END SUBROUTINE tic_tac
-
    
 #else
@@ -1841 +1814 @@
       IF( numstp     /= -1 )   CALL FLUSH(numstp    )
       IF( numrun     /= -1 )   CALL FLUSH(numrun    )
-      IF( numevo_ice /= -1 )   CALL FLUSH(numevo_ice)
       !
       IF( cd1 == 'STOP' ) THEN

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/mpp_nfd_generic.h90

@@ -95 +95 @@
          l_full_nf_update = .TRUE.
 
-         ! Two lines update (slower but necessary to avoid different values ion identical grid points
-         IF ( l_full_nf_update .OR.                          &    ! if coupling fields
-              ( ncom_stp == nit000 .AND. .NOT. ln_rstart ) ) &    ! at first time step, if not restart
-            ipj_s(:) = 2
+         ipj_s(:) = 2
 
          ! Index of modifying lines in input