Changeset 8577 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC

Timestamp:

2017-10-02T12:05:28+02:00 (7 years ago)

Author:

clem

Message:

bug fixes to start passing all the magnificient sette tests

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC

Files:

• diawri.F90 (modified) (2 diffs)
• nemogcm.F90 (modified) (1 diff)
• sbcssm.F90 (modified) (1 diff)
• step.F90 (modified) (2 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/diawri.F90

@@ -39 +39 @@
    USE ioipsl
 #if defined key_lim3
-   USE limwri
+   USE icewri
 #endif
    USE lib_mpp         ! MPP library
@@ -397 +397 @@
 #if defined key_lim3
       IF( nn_ice == 2 ) THEN   ! clem2017: condition in case agrif + lim but no-ice in child grid
-         CALL lim_wri_state( kt, id_i, nh_i )
+         CALL ice_wri_state( kt, id_i, nh_i )
       ENDIF
 #else

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -510 +510 @@
       ierr =        dia_wri_alloc   ()
       ierr = ierr + dom_oce_alloc   ()          ! ocean domain
-      ierr = ierr + oce_alloc       ()          ! (tsn...) needed for agrif and/or lim3 and bdy
+      ierr = ierr + oce_alloc       ()          ! (tsn...) needed for agrif and/or ESIM and bdy
       ierr = ierr + bdy_oce_alloc   ()          ! bdy masks (incl. initialization)
       !

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

@@ -313 +313 @@
    ENDIF
  
-      CALL sbc_ssm( nit000 )   ! need to define ss?_m arrays used in limistate
+      CALL sbc_ssm( nit000 )   ! need to define ss?_m arrays used in iceistate
       l_initdone = .TRUE.
       !

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/step.F90

@@ -24 +24 @@
    USE diawri           ! Standard run outputs             (dia_wri routine)
    USE bdy_oce   , ONLY: ln_bdy
-   USE bdydta           ! clem: mandatory for LIM3
+   USE bdydta           ! clem: mandatory for ESIM
    USE stpctl           ! time stepping control            (stp_ctl routine)
    !
@@ -89 +89 @@
                              CALL iom_setkt( kstp - nit000 + 1, cxios_context )   ! tell iom we are at time step kstp
 
-      ! ==> clem: open boundaries is mandatory for LIM3 because ice BDY is not decoupled from  
+      ! ==> clem: open boundaries is mandatory for ESIM because ice BDY is not decoupled from  
       !           the environment of ocean BDY. Therefore bdy is called in both OPA and SAS modules.
       !           From SAS: ocean bdy data are wrong  (but we do not care) and ice bdy data are OK.