Changeset 5376 for branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/SAS_SRC

Timestamp:

2015-06-08T15:13:26+02:00 (9 years ago)

Author:

smasson

Message:

dev_r5218_CNRS17_coupling: bugfix for SAS-OPA coupling

Location:

branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/SAS_SRC

Files:

• nemogcm.F90 (modified) (4 diffs)
• sbcssm.F90 (modified) (6 diffs)

branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -175 +175 @@
       INTEGER ::   ios
       CHARACTER(len=80), DIMENSION(16) ::   cltxt
+      CHARACTER(len=80) ::   clname
       !
       NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   &
@@ -190 +191 @@
          CALL ctl_opn( numnam_cfg, 'namelist_sas_cfg', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. )
          cxios_context = 'sas'
+         clname = 'output.namelist_sas.dyn'
       ELSE
          CALL ctl_opn( numnam_ref, 'namelist_ref', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. )
          CALL ctl_opn( numnam_cfg, 'namelist_cfg', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. )
          cxios_context = 'nemo'
+         clname = 'output.namelist.dyn'
    ENDIF
       !
@@ -244 +247 @@
          ENDIF
       ENDIF
-      narea = mynode ( cltxt, numnam_ref, numnam_cfg, numond , nstop, ilocal_comm )  ! Nodes selection
+      narea = mynode ( cltxt, clname, numnam_ref, numnam_cfg, numond , nstop, ilocal_comm )  ! Nodes selection
 #else
       IF( lk_oasis ) THEN
@@ -250 +253 @@
             CALL cpl_init( "sas", ilocal_comm )                          ! nemo local communicator given by oasis
          ENDIF
-         narea = mynode( cltxt, numnam_ref, numnam_cfg, numond , nstop, ilocal_comm )   ! Nodes selection (control print return in cltxt)
+         narea = mynode( cltxt, clname, numnam_ref, numnam_cfg, numond , nstop, ilocal_comm )   ! Nodes selection (control print return in cltxt)
       ELSE
          ilocal_comm = 0
-         narea = mynode( cltxt, numnam_ref, numnam_cfg, numond , nstop )                ! Nodes selection (control print return in cltxt)
+         narea = mynode( cltxt, clname, numnam_ref, numnam_cfg, numond , nstop )                ! Nodes selection (control print return in cltxt)
       ENDIF
 #endif

branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

@@ -39 +39 @@
    LOGICAL              ::   ln_3d_uve     !: specify whether input velocity data is 3D
    LOGICAL              ::   ln_read_frq   !: specify whether we must read frq or not
+   LOGICAL              ::   l_initdone = .false.
    INTEGER     ::   nfld_3d
    INTEGER     ::   nfld_2d
@@ -99 +100 @@
       IF( ln_read_frq )   frq_m(:,:) = sf_ssm_2d(jf_frq)%fnow(:,:,1) * tmask(:,:,1)    ! sea surface height
       !
-      tsn(:,:,1,jp_tem) = sst_m(:,:)
-      tsn(:,:,1,jp_sal) = sss_m(:,:)
       IF ( nn_ice == 1 ) THEN
+         tsn(:,:,1,jp_tem) = sst_m(:,:)
+         tsn(:,:,1,jp_sal) = sss_m(:,:)
          tsb(:,:,1,jp_tem) = sst_m(:,:)
          tsb(:,:,1,jp_sal) = sss_m(:,:)
@@ -118 +119 @@
       ENDIF
       !
+      IF( l_initdone ) THEN          !   Mean value at each nn_fsbc time-step   !
+         CALL iom_put( 'ssu_m', ssu_m )
+         CALL iom_put( 'ssv_m', ssv_m )
+         CALL iom_put( 'sst_m', sst_m )
+         CALL iom_put( 'sss_m', sss_m )
+         CALL iom_put( 'ssh_m', ssh_m )
+         IF( lk_vvl      )   CALL iom_put( 'e3t_m', e3t_m )
+         IF( ln_read_frq )   CALL iom_put( 'frq_m', frq_m )
+      ENDIF
+      !
       IF( nn_timing == 1 )  CALL timing_stop( 'sbc_ssm')
       !
@@ -146 +157 @@
       NAMELIST/namsbc_sas/cn_dir, ln_3d_uve, ln_read_frq, sn_tem, sn_sal, sn_usp, sn_vsp, sn_ssh, sn_e3t, sn_frq
       !!----------------------------------------------------------------------
+      
+      IF( ln_rstart .AND. nn_components == jp_iam_sas ) RETURN
       
       REWIND( numnam_ref )              ! Namelist namsbc_sas in reference namelist : Input fields
@@ -167 +180 @@
          WRITE(numout,*)
       ENDIF
-      
-      !
-      !! switch off stuff that isn't sensible with a standalone module
-      !! note that we need sbc_ssm called first in sbc
-      !
-      IF( ln_apr_dyn ) THEN
-         IF( lwp ) WRITE(numout,*) 'No atmospheric gradient needed with StandAlone Surface scheme'
-         ln_apr_dyn = .FALSE.
-      ENDIF
-      IF( ln_dm2dc ) THEN
-         IF( lwp ) WRITE(numout,*) 'No diurnal cycle needed with StandAlone Surface scheme'
-         ln_dm2dc = .FALSE.
-      ENDIF
-      IF( ln_rnf ) THEN
-         IF( lwp ) WRITE(numout,*) 'No runoff needed with StandAlone Surface scheme'
-         ln_rnf = .FALSE.
-      ENDIF
-      IF( ln_ssr ) THEN
-         IF( lwp ) WRITE(numout,*) 'No surface relaxation needed with StandAlone Surface scheme'
-         ln_ssr = .FALSE.
-      ENDIF
-      IF( nn_fwb > 0 ) THEN
-         IF( lwp ) WRITE(numout,*) 'No freshwater budget adjustment needed with StandAlone Surface scheme'
-         nn_fwb = 0
-      ENDIF
-      IF( nn_closea > 0 ) THEN
-         IF( lwp ) WRITE(numout,*) 'No closed seas adjustment needed with StandAlone Surface scheme'
-         nn_closea = 0
-      ENDIF
-
+
+      IF( nn_components /= jp_iam_sas ) THEN 
+         !
+         !! switch off stuff that isn't sensible with a standalone module
+         !! note that we need sbc_ssm called first in sbc
+         !
+         IF( ln_apr_dyn ) THEN
+            IF( lwp ) WRITE(numout,*) 'No atmospheric gradient needed with StandAlone Surface scheme'
+            ln_apr_dyn = .FALSE.
+         ENDIF
+         IF( ln_dm2dc ) THEN
+            IF( lwp ) WRITE(numout,*) 'No diurnal cycle needed with StandAlone Surface scheme'
+            ln_dm2dc = .FALSE.
+         ENDIF
+         IF( ln_rnf ) THEN
+            IF( lwp ) WRITE(numout,*) 'No runoff needed with StandAlone Surface scheme'
+            ln_rnf = .FALSE.
+         ENDIF
+         IF( ln_ssr ) THEN
+            IF( lwp ) WRITE(numout,*) 'No surface relaxation needed with StandAlone Surface scheme'
+            ln_ssr = .FALSE.
+         ENDIF
+         IF( nn_fwb > 0 ) THEN
+            IF( lwp ) WRITE(numout,*) 'No freshwater budget adjustment needed with StandAlone Surface scheme'
+            nn_fwb = 0
+         ENDIF
+         IF( nn_closea > 0 ) THEN
+            IF( lwp ) WRITE(numout,*) 'No closed seas adjustment needed with StandAlone Surface scheme'
+            nn_closea = 0
+         ENDIF
+         
+      ENDIF
       ! 
       !! following code is a bit messy, but distinguishes between when u,v are 3d arrays and
@@ -280 +295 @@
       CALL sbc_ssm( nit000 )   ! need to define ss?_m arrays used in limistate
       IF( .NOT. ln_read_frq )   frq_m(:,:) = 1.
+      l_initdone = .TRUE.
       !
    END SUBROUTINE sbc_ssm_init