Changeset 11646 for NEMO/branches/UKMO

Timestamp:

2019-10-03T14:13:02+02:00 (5 years ago)

Author:

andmirek

Message:

Ticket #2314 changes for GO8 for tests

Location:

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_decoupled/src/SAS

Files:

• lib_mpp.F90 (added)
• nemogcm.F90 (modified) (3 diffs)
• sbcssm.F90 (modified) (1 diff)
• stpctl.F90 (modified) (2 diffs)
• timing.F90 (added)

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_decoupled/src/SAS/nemogcm.F90

@@ -52 +52 @@
    CHARACTER(lc) ::   cform_aaa="( /, 'AAAAAAAA', / ) "     ! flag for output listing
 
+#if defined key_mpp_mpi
+   INCLUDE 'mpif.h'
+#endif
    !!----------------------------------------------------------------------
    !! NEMO/SAS 4.0 , NEMO Consortium (2018)
@@ -113 +116 @@
       !
       DO WHILE( istp <= nitend .AND. nstop == 0 )
+#if defined key_mpp_mpi
+            ncom_stp = istp
+            IF ( istp == ( nit000 + 1 ) ) elapsed_time = MPI_Wtime()
+            IF ( istp ==         nitend ) elapsed_time = MPI_Wtime() - elapsed_time
+#endif
          CALL stp
          istp = istp + 1
@@ -128 +136 @@
          !
          DO WHILE( istp <= nitend .AND. nstop == 0 )
+#if defined key_mpp_mpi
+            ncom_stp = istp
+            IF ( istp == ( nit000 + 1 ) ) elapsed_time = MPI_Wtime()
+            IF ( istp ==         nitend ) elapsed_time = MPI_Wtime() - elapsed_time
+#endif
             CALL stp        ( istp ) 
             istp = istp + 1

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_decoupled/src/SAS/sbcssm.F90

@@ -178 +178 @@
       !!----------------------------------------------------------------------
       !
-      IF( ln_rstart .AND. nn_components == jp_iam_sas )   RETURN
+      !EM disable reading if not restart 
+      !EM IF( ln_rstart .AND. nn_components == jp_iam_sas )   RETURN
+      IF( nn_components == jp_iam_sas )   RETURN
       !
       IF(lwp) THEN

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_decoupled/src/SAS/stpctl.F90

@@ -60 +60 @@
       LOGICAL                ::   ll_wrtstp, ll_colruns, ll_wrtruns
       CHARACTER(len=20) :: clname
+      CHARACTER(len=20) :: cfts_name, cfrs_name, cfrsnc_name
       !!----------------------------------------------------------------------
       !
@@ -70 +71 @@
          WRITE(numout,*) '~~~~~~~'
          !                                ! open time.step file
-         IF( lwm ) CALL ctl_opn( numstp, 'time.step', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
+         cfts_name='time.step'
+         cfrs_name='run.stat'
+         cfrsnc_name='run.stat.nc'
+
+         IF( TRIM(cxios_context) == 'sas' ) THEN
+            WRITE(cfts_name,'(A4,A9)') 'sas_', TRIM(cfts_name)
+            WRITE(cfrs_name,'(A4,A8)') 'sas_', TRIM(cfrs_name)
+            WRITE(cfrsnc_name,'(A4,A11)') 'sas_', TRIM(cfrsnc_name)
+         ENDIF
+
+         IF( lwm ) CALL ctl_opn( numstp, TRIM(cfts_name), 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
          !                                ! open run.stat file(s) at start whatever
          !                                ! the value of sn_cfctl%ptimincr
          IF( lwm .AND. ( ln_ctl .OR. sn_cfctl%l_runstat ) ) THEN
-            CALL ctl_opn( numrun, 'run.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
-            clname = 'run.stat.nc'
+            CALL ctl_opn( numrun, TRIM(cfrs_name), 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
+            clname = TRIM(cfrsnc_name)
             IF( .NOT. Agrif_Root() )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname)
-            istatus = NF90_CREATE( 'run.stat.nc', NF90_CLOBBER, idrun )
+            istatus = NF90_CREATE( TRIM(cfrsnc_name), NF90_CLOBBER, idrun )
             istatus = NF90_DEF_DIM( idrun, 'time'     , NF90_UNLIMITED, idtime )
             istatus = NF90_DEF_VAR( idrun, 'vt_i_max' , NF90_DOUBLE, (/ idtime /), idssh )