Changeset 7761 for trunk/NEMOGCM/NEMO/SAS_SRC

Timestamp:

2017-03-06T18:58:35+01:00 (7 years ago)

Author:

clem

Message:

make AGRIF and LIM3 fully compatible

Location:

trunk/NEMOGCM/NEMO/SAS_SRC

Files:

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

trunk/NEMOGCM/NEMO/SAS_SRC/daymod.F90

@@ -80 +80 @@
       IF( MOD( rday , 2.  ) /= 0. )   CALL ctl_stop( 'the number of second of in a day must be an even number'    )
       IF( MOD( rdt  , 2.  ) /= 0. )   CALL ctl_stop( 'the time step (in second) must be an even number'           )
-      nsecd   = NINT(rday         )
-      nsecd05 = NINT(0.5 * rday   )
-      ndt     = NINT(      rdt    )
-      ndt05   = NINT(0.5 * rdt    )
+      nsecd   = NINT(rday       )
+      nsecd05 = NINT(0.5 * rday )
+      ndt     = NINT(      rdt  )
+      ndt05   = NINT(0.5 * rdt  )
 
       ! ==> clem: here we read the ocean restart for the date (only if it exists)

trunk/NEMOGCM/NEMO/SAS_SRC/diawri.F90

@@ -40 +40 @@
 #if defined key_lim2
    USE limwri_2 
+#elif defined key_lim3
+   USE limwri
 #endif
    USE lib_mpp         ! MPP library
@@ -80 +82 @@
    !!   Default option                                   NetCDF output file
    !!----------------------------------------------------------------------
-#if defined key_iomput
+# if defined key_iomput
    !!----------------------------------------------------------------------
    !!   'key_iomput'                                        use IOM library
@@ -95 +97 @@
       !! ** Method  :  use iom_put
       !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt   ! ocean time-step index
+      !!
+      INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
       !!----------------------------------------------------------------------
       ! 
-      !! no relevant 2D arrays to write in iomput case
+      ! Output the initial state and forcings
+      IF( ninist == 1 ) THEN
+         CALL dia_wri_state( 'output.init', kt )
+         ninist = 0
+      ENDIF
       !
    END SUBROUTINE dia_wri
@@ -392 +399 @@
 #if defined key_lim2
       CALL lim_wri_state_2( kt, id_i, nh_i )
+#elif defined key_lim3
+      CALL lim_wri_state( kt, id_i, nh_i )
 #else
       CALL histend( id_i, snc4chunks=snc4set )

trunk/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -308 +308 @@
       jpim1 = jpi-1                                            ! inner domain indices
       jpjm1 = jpj-1                                            !   "           "
-      jpkm1 = jpk-1                                            !   "           "
+      jpkm1 = MAX( 1, jpk-1 )                                  !   "           "
       jpij  = jpi*jpj                                          !  jpi x j
 
@@ -370 +370 @@
       !           the environment of ocean BDY. Therefore bdy is called in both OPA and SAS modules. 
       !           This is not clean and should be changed in the future. 
-                            CALL     bdy_init
+                            CALL bdy_init
       ! ==>
                             CALL icb_init( rdt, nit000)   ! initialise icebergs instance

trunk/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

@@ -88 +88 @@
          ! 
          IF( ln_3d_uve ) THEN
-            IF( .NOT. ln_linssh )   e3t_m(:,:) = sf_ssm_3d(jf_e3t)%fnow(:,:,1) * tmask(:,:,1)    ! v-velocity 
-                                    ssu_m(:,:) = sf_ssm_3d(jf_usp)%fnow(:,:,1) * umask(:,:,1)    ! u-velocity
-                                    ssv_m(:,:) = sf_ssm_3d(jf_vsp)%fnow(:,:,1) * vmask(:,:,1)    ! v-velocity 
+            IF( .NOT. ln_linssh ) THEN
+               e3t_m(:,:) = sf_ssm_3d(jf_e3t)%fnow(:,:,1) * tmask(:,:,1) ! vertical scale factor 
+            ELSE
+               e3t_m(:,:) = e3t_0(:,:,1)                                 ! vertical scale factor
+            ENDIF
+            ssu_m(:,:) = sf_ssm_3d(jf_usp)%fnow(:,:,1) * umask(:,:,1)    ! u-velocity
+            ssv_m(:,:) = sf_ssm_3d(jf_vsp)%fnow(:,:,1) * vmask(:,:,1)    ! v-velocity 
          ELSE
-            IF( .NOT. ln_linssh )   e3t_m(:,:) = sf_ssm_2d(jf_e3t)%fnow(:,:,1) * tmask(:,:,1)    ! v-velocity 
-                                    ssu_m(:,:) = sf_ssm_2d(jf_usp)%fnow(:,:,1) * umask(:,:,1)    ! u-velocity
-                                    ssv_m(:,:) = sf_ssm_2d(jf_vsp)%fnow(:,:,1) * vmask(:,:,1)    ! v-velocity 
+            IF( .NOT. ln_linssh ) THEN
+               e3t_m(:,:) = sf_ssm_2d(jf_e3t)%fnow(:,:,1) * tmask(:,:,1) ! vertical scale factor 
+            ELSE
+               e3t_m(:,:) = e3t_0(:,:,1)                                 ! vertical scale factor
+            ENDIF
+            ssu_m(:,:) = sf_ssm_2d(jf_usp)%fnow(:,:,1) * umask(:,:,1)    ! u-velocity
+            ssv_m(:,:) = sf_ssm_2d(jf_vsp)%fnow(:,:,1) * vmask(:,:,1)    ! v-velocity 
          ENDIF
          !
@@ -111 +119 @@
          ssv_m(:,:) = 0._wp
          ssh_m(:,:) = 0._wp
-         e3t_m(:,:) = e3t_0(:,:,1) !clem: necessary at least for sas2D
-         frq_m(:,:) = 1._wp        !              - -
-         sshn (:,:) = 0._wp        !              - -
+         IF( .NOT. ln_linssh ) e3t_m(:,:) = e3t_0(:,:,1) !clem: necessary at least for sas2D
+         frq_m(:,:) = 1._wp                              !              - -
+         sshn (:,:) = 0._wp                              !              - -
       ENDIF
       
@@ -173 +181 @@
       NAMELIST/namsbc_sas/l_sasread, 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
       
@@ -306 +314 @@
  
       CALL sbc_ssm( nit000 )   ! need to define ss?_m arrays used in limistate
-      IF( .NOT. ln_read_frq )   frq_m(:,:) = 1.
       l_initdone = .TRUE.
       !

trunk/NEMOGCM/NEMO/SAS_SRC/step.F90

@@ -53 +53 @@
 
 #if defined key_agrif
-   SUBROUTINE stp( )
+   RECURSIVE SUBROUTINE stp( )
       INTEGER             ::   kstp   ! ocean time-step index
 #else