Changeset 4166

Timestamp:

2013-11-08T06:51:52+01:00 (10 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2013 : bugs corrections, see ticket #1169

Location:

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO

Files:

• LIM_SRC_3/limistate.F90 (modified) (3 diffs)
• OFF_SRC/nemogcm.F90 (modified) (1 diff)
• OPA_SRC/DIA/diahsb.F90 (modified) (2 diffs)
• SAS_SRC/nemogcm.F90 (modified) (1 diff)
• SAS_SRC/step.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -36 +36 @@
    PUBLIC   lim_istate      ! routine called by lim_init.F90
 
-   !                       !!** init namelist (namiceini) **
-   REAL(wp) ::   ttest      ! threshold water temperature for initial sea ice
-   REAL(wp) ::   hninn      ! initial snow thickness in the north
-   REAL(wp) ::   hginn_u    ! initial ice thickness in the north
-   REAL(wp) ::   aginn_u    ! initial leads area in the north
-   REAL(wp) ::   hginn_d    ! initial ice thickness in the north
-   REAL(wp) ::   aginn_d    ! initial leads area in the north
-   REAL(wp) ::   hnins      ! initial snow thickness in the south
-   REAL(wp) ::   hgins_u    ! initial ice thickness in the south
-   REAL(wp) ::   agins_u    ! initial leads area in the south
-   REAL(wp) ::   hgins_d    ! initial ice thickness in the south
-   REAL(wp) ::   agins_d    ! initial leads area in the south
-   REAL(wp) ::   sinn       ! initial salinity 
-   REAL(wp) ::   sins       !
+
+   !! * Module variables
+   !                          !!** init namelist (namiceini) **
+   REAL(wp) ::   ttest   ! threshold water temperature for initial sea ice
+   REAL(wp) ::   hninn   ! initial snow thickness in the north
+   REAL(wp) ::   hnins   ! initial snow thickness in the south
+   REAL(wp) ::   hginn   ! initial ice thickness in the north
+   REAL(wp) ::   hgins   ! initial ice thickness in the south
+   REAL(wp) ::   aginn   ! initial leads area in the north
+   REAL(wp) ::   agins   ! initial leads area in the south
+   REAL(wp) ::   sinn    ! initial salinity 
+   REAL(wp) ::   sins  
 
    !!----------------------------------------------------------------------
@@ -483 +481 @@
       !!  8.5  ! 07-11 (M. Vancoppenolle) rewritten initialization
       !!-----------------------------------------------------------------------------
-<<<<<<< .courant
+      NAMELIST/namiceini/ ttest, hninn, hnins, hginn, hgins, aginn, agins, sinn, sins
+      !
       INTEGER :: ios                 ! Local integer output status for namelist read
-      NAMELIST/namiceini/ ttest, hninn, hginn_u, aginn_u, hginn_d, aginn_d, hnins,   &
-         &                hgins_u, agins_u, hgins_d, agins_d, sinn, sins
-=======
-      NAMELIST/namiceini/ ttest, hninn, hnins, hginn, hgins, aginn, agins, sinn, sins
->>>>>>> .fusion-droit.r4160
       !!-----------------------------------------------------------------------------
-<<<<<<< .courant
       !
       REWIND( numnam_ice_ref )              ! Namelist namiceini in reference namelist : Ice initial state
@@ -501 +494 @@
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in configuration namelist', lwp )
       WRITE ( numoni, namiceini )
-=======
 
       ! Define the initial parameters
       ! -------------------------
 
-      ! Read Namelist namiceini 
-      REWIND ( numnam_ice )
-      READ   ( numnam_ice , namiceini )
->>>>>>> .fusion-droit.r4160
       IF(lwp) THEN
          WRITE(numout,*)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

@@ -106 +106 @@
       END DO
 #if defined key_iomput
-      CALL xios_context_finalize() ! needed for XIOS+AGRIF
+      CALL iom_context_finalize( "nemo" ) ! needed for XIOS+AGRIF
 #endif
 

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

@@ -26 +26 @@
    USE restart         ! ocean restart
    USE wrk_nemo         ! work arrays
+   USE sbcrnf         ! river runoffd
 
    IMPLICIT NONE
@@ -196 +197 @@
       !!
       NAMELIST/namhsb/ ln_diahsb
+      !
+      INTEGER  ::   ios
       !!----------------------------------------------------------------------
-      !
-      REWIND ( numnam )              ! Read Namelist namhsb 
-      READ   ( numnam, namhsb )
+
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'dia_hsb_init : check the heat and salt budgets'
+         WRITE(numout,*) '~~~~~~~~ '
+      ENDIF
+
+      REWIND( numnam_ref )              ! Namelist namhsb in reference namelist
+      READ  ( numnam_ref, namhsb, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namhsb in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namhsb in configuration namelist
+      READ  ( numnam_cfg, namhsb, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namhsb in configuration namelist', lwp )
+      WRITE ( numond, namhsb )
+
       !
       IF(lwp) THEN                   ! Control print
          WRITE(numout,*)
-         WRITE(numout,*) 'dia_hsb_init : check the heat and salt budgets'
-         WRITE(numout,*) '~~~~~~~~~~~~'
          WRITE(numout,*) '   Namelist namhsb : set hsb parameters'
          WRITE(numout,*) '      Switch for hsb diagnostic (T) or not (F)  ln_diahsb  = ', ln_diahsb

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -431 +431 @@
       ierr =        dia_wri_alloc   ()
       ierr = ierr + dom_oce_alloc   ()          ! ocean domain
-      ierr = ierr + lib_mpp_alloc   (numout)    ! mpp exchanges
       ALLOCATE( snwice_mass(jpi,jpj)  , snwice_mass_b(jpi,jpj),             &
          &      snwice_fmass(jpi,jpj), STAT= ierr4 )

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/SAS_SRC/step.F90

@@ -72 +72 @@
       kstp = nit000 + Agrif_Nb_Step()
 # if defined key_iomput
-      IF( Agrif_Nbstepint() == 0 )   CALL iom_swap
+      IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( "nemo" )
 # endif   
 #endif   
-      IF( kstp == nit000 )   CALL iom_init            ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
+      IF( kstp == nit000 )   CALL iom_init( "nemo" )       ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
       IF( kstp /= nit000 )   CALL day( kstp )             ! Calendar (day was already called at nit000 in day_init)
-                             CALL iom_setkt( kstp )       ! say to iom that we are at time step kstp
+                             CALL iom_setkt( kstp, "nemo" )       ! say to iom that we are at time step kstp
 
                              CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice)
@@ -87 +87 @@
                              CALL stp_ctl( kstp, indic )
 #if defined key_iomput
-      IF( kstp == nitend )   CALL xios_context_finalize() ! needed for XIOS+AGRIF
+      IF( kstp == nitend )   CALL iom_context_finalize( "nemo" ) ! needed for XIOS+AGRIF
 #endif
       !