Changeset 11

Timestamp:

06/27/19 14:15:12 (4 years ago)

Author:

snguyen

Message:

removed bug : not writing restart when doing several periods of computation

Location:

SCHWARZ_ORCA2LIM3/SOURCES/NEMO

Files:

• nemogcm.F90 (modified) (3 diffs)
• restart.F90 (modified) (2 diffs)
• sbcmod.F90 (modified) (1 diff)

SCHWARZ_ORCA2LIM3/SOURCES/NEMO/nemogcm.F90

@@ -42 +42 @@
    !!----------------------------------------------------------------------
    USE dom_oce, ONLY : rdt
-   USE in_out_manager, ONLY : kswr, ksout, mswr, kall, ntsinswr, nsloops, iswloop, lwp
+   USE in_out_manager, ONLY : kswr, ksout, mswr, kall, ntsinswr, nsloops, iswloop, lwp, nitrst
    USE schwarz         ! schwarz subroutines
    USE step_oce        ! module used in the ocean time stepping module
@@ -128 +128 @@
 
       ntsinswr = 1 !! set to allow fldread in nemo_init before computation of schwarz indices
+      kswr = 0     !! set here to allow day_init to set nitrst properly
 
       WRITE(numout,*) "ntsinswr = ",ntsinswr
@@ -151 +152 @@
          WRITE(numout,*) '   nsloops  = ',nsloops 
          WRITE(numout,*) '   mswr     = ',mswr
+         WRITE(numout,*) '   nitrst   = ',nitrst
       ENDIF
 

SCHWARZ_ORCA2LIM3/SOURCES/NEMO/restart.F90

@@ -60 +60 @@
       !!----------------------------------------------------------------------
       !
-      IF( kt == nit000 .AND. kswr == 1 ) THEN   ! default definitions
+      IF( kt == nit000 .AND. kswr == 0 ) THEN   ! default definitions
          lrst_oce = .FALSE.   
          IF( ln_rst_list ) THEN
@@ -76 +76 @@
          IF( nitrst > nitend )   nitrst = nitend   ! make sure we write a restart at the end of the run
       ENDIF
+
       ! to get better performances with NetCDF format:
       ! we open and define the ocean restart file one time step before writing the data (-> at nitrst - 1)

SCHWARZ_ORCA2LIM3/SOURCES/NEMO/sbcmod.F90

@@ -465 +465 @@
          CALL iom_rstput( kt, nitrst, numrow, 'utau_b' , utau )
          CALL iom_rstput( kt, nitrst, numrow, 'vtau_b' , vtau )
-
+         CALL iom_rstput( kt, nitrst, numrow, 'qns_b'  , qns  )
          ! The 3D heat content due to qsr forcing is treated in traqsr
          ! CALL iom_rstput( kt, nitrst, numrow, 'qsr_b'  , qsr  )