Changeset 14137 for NEMO/trunk/src

Timestamp:

2020-12-09T10:55:03+01:00 (3 years ago)

Author:

techene

Message:

#2385 : swe is now working (SWE/restart.F90 and SWE/stpctl.F90 moved as subroutines of OCE/IOM/restart.F90 and OCE/stpctl.F90)

Location:

NEMO/trunk/src/SWE

Files:

• nemogcm.F90 (modified) (6 diffs)
• restart.F90 (deleted)
• stp_oce.F90 (modified) (1 diff)
• stpctl.F90 (deleted)
• stpmlf.F90 (modified) (3 diffs)
• stprk3.F90 (modified) (1 diff)

NEMO/trunk/src/SWE/nemogcm.F90

@@ -33 +33 @@
    USE lbcnfd  , ONLY : isendto, nsndto  ! Setup of north fold exchanges 
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
-   USE halo_mng       ! Halo manager
+   USE halo_mng       ! halo manager
 
    IMPLICIT NONE
@@ -127 +127 @@
       IF( nstop /= 0 .AND. lwp ) THEN        ! error print
          WRITE(ctmp1,*) '   ==>>>   nemo_gcm: a total of ', nstop, ' errors have been found'
-         CALL ctl_stop( ctmp1 )
+         WRITE(ctmp2,*) '           Look for "E R R O R" messages in all existing ocean_output* files'
+         CALL ctl_stop( ' ', ctmp1, ' ', ctmp2 )
       ENDIF
       !
@@ -216 +217 @@
          WRITE(numout,*) '                       NEMO team'
          WRITE(numout,*) '            Ocean General Circulation Model'
-         WRITE(numout,*) '                NEMO version 4.0  (2019) '
+         WRITE(numout,*) '                NEMO version 4.0  (2020) '
+         WRITE(numout,*)
+         WRITE(numout,*) '                 Shallow Water Equation'
+         WRITE(numout,*) '                 ======================'
          WRITE(numout,*)
          WRITE(numout,*) "           ._      ._      ._      ._      ._    "
@@ -232 +236 @@
          WRITE(numout,*) "     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ "
          WRITE(numout,*)
-         
-         ! Print the working precision to ocean.output
-         IF (wp == dp) THEN
-            WRITE(numout,*) "Working precision = double-precision"
-         ELSE
-            WRITE(numout,*) "Working precision = single-precision"
+         !
+         WRITE(numout,cform_aaa)    ! Flag AAAAAAA
+         !
+         !                          ! Control print of the working precision
+         WRITE(numout,*)
+         IF( wp == dp ) THEN   ;   WRITE(numout,*) "par_kind : wp = Working precision = dp = double-precision"
+         ELSE                  ;   WRITE(numout,*) "par_kind : wp = Working precision = sp = single-precision"
          ENDIF
-         WRITE(numout,*)
-         !
-         WRITE(numout,cform_aaa)                                        ! Flag AAAAAAA
+                                   WRITE(numout,*) "~~~~~~~~                                 ****************"
+                                   WRITE(numout,*)
          !
       ENDIF
@@ -280 +284 @@
       !                             !-------------------------------!
 
-      CALL nemo_ctl                          ! Control prints
+      CALL nemo_ctl                          ! Control prints of namctl and namcfg
       !
       !                                      ! General initialization
@@ -429 +433 @@
    END SUBROUTINE nemo_alloc
 
-   
+
    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto )
       !!----------------------------------------------------------------------

NEMO/trunk/src/SWE/stp_oce.F90

@@ -93 +93 @@
    !                                                   (dyn_asm_inc routine)
    USE asmbkg          ! writing out state trajectory
-   USE stpctl          ! time stepping control            (stp_ctl routine)
+   USE stpctl          ! time stepping control            (stp_ctl_SWE routine)
    USE restart         ! ocean restart                    (rst_wri routine)
    USE prtctl          ! Print control                    (prt_ctl routine)

NEMO/trunk/src/SWE/stpmlf.F90

@@ -70 +70 @@
       ENDIF
 
-      IF( kstp == nit000 )   ww(:,:,:) = 0._wp   ! initialize vertical velocity one for all to zero
+      IF( kstp == nit000 )   ww(:,:,:) = 0._wp   ! initialize vertical velocity once for all to zero
 
       !
@@ -222 +222 @@
       ! Control
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-                         CALL stp_ctl      ( kstp, Nnn )
+                         CALL stp_ctl_SWE   ( kstp, Nnn )
 
       IF( kstp == nit000 ) THEN                          ! 1st time step only
@@ -235 +235 @@
 !!st : cxios_context needed ? because opened earlier ???         
          CALL iom_context_finalize( cxios_context ) ! needed for XIOS+AGRIF
-!!st : crxios_context not needed associated with coarsening ! 
-         IF(lrxios) CALL iom_context_finalize( crxios_context )
       ENDIF
 #endif

NEMO/trunk/src/SWE/stprk3.F90

@@ -355 +355 @@
       ! Control
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-                         CALL stp_ctl      ( kstp, Nnn )
+                         CALL stp_ctl_SWE  ( kstp, Nnn )
 
       IF( kstp == nit000 ) THEN                          ! 1st time step only