Changeset 4276 for branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/SAS_SRC

Timestamp:

2013-11-20T10:35:28+01:00 (11 years ago)

Author:

cbricaud

Message:

merge changes from 3856 to 4119 from trunk in dev_r3856_MERCATOR3_QSRMEAN24

Location:

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/SAS_SRC

Files:

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

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/SAS_SRC/daymod.F90

@@ -246 +246 @@
                nday_year = 1
                nsec_year = ndt05
+               IF( nsec1jan000 >= 2 * (2**30 - nsecd * nyear_len(1) / 2 ) ) THEN   ! test integer 4 max value
+                  CALL ctl_stop( 'The number of seconds between Jan. 1st 00h of nit000 year and Jan. 1st 00h ',   &
+                     &           'of the current year is exceeding the INTEGER 4 max VALUE: 2^31-1 -> 68.09 years in seconds', &
+                     & 'You must do a restart at higher frequency (or remove this STOP and recompile everything in I8)' )
+               ENDIF
                nsec1jan000 = nsec1jan000 + nsecd * nyear_len(1)
                IF( nleapy == 1 )   CALL day_mth

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/SAS_SRC/diawri.F90

@@ -259 +259 @@
          CALL histdef( nid_T, "sowaflup", "Net Upward Water Flux"              , "Kg/m2/s",   &  ! (emp-rnf)
             &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
-         CALL histdef( nid_T, "sowaflcd", "concentration/dilution water flux"  , "kg/m2/s",   &  ! (emps-rnf)
-            &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
+         CALL histdef( nid_T, "sosfldow", "downward salt flux"                 , "PSU/m2/s",  &  ! (sfx)
+             &         jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
          CALL histdef( nid_T, "sohefldo", "Net Downward Heat Flux"             , "W/m2"   ,   &  ! qns + qsr
             &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
@@ -309 +309 @@
       CALL histwrite( nid_T, "sst_m", it, sst_m, ndim_hT, ndex_hT )   ! sea surface temperature
       CALL histwrite( nid_T, "sss_m", it, sss_m, ndim_hT, ndex_hT )   ! sea surface salinity
-      CALL histwrite( nid_T, "sowaflup", it, emp   , ndim_hT, ndex_hT )   ! upward water flux
-      CALL histwrite( nid_T, "sowaflcd", it, emps  , ndim_hT, ndex_hT )   ! c/d water flux
+      CALL histwrite( nid_T, "sowaflup", it, (emp - rnf )  , ndim_hT, ndex_hT )   ! upward water flux
+      CALL histwrite( nid_T, "sosfldow", it, sfx           , ndim_hT, ndex_hT )   ! downward salt flux 
+                                                                                  ! (includes virtual salt flux beneath ice 
+                                                                                  ! in linear free surface case)
+
       CALL histwrite( nid_T, "sohefldo", it, qns + qsr     , ndim_hT, ndex_hT )   ! total heat flux
       CALL histwrite( nid_T, "soshfldo", it, qsr           , ndim_hT, ndex_hT )   ! solar heat flux

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

@@ -382 +382 @@
       USE diawri    , ONLY: dia_wri_alloc
       USE dom_oce   , ONLY: dom_oce_alloc
-      !
-      INTEGER :: ierr
+      USE oce       , ONLY : sshn, sshb, snwice_mass, snwice_mass_b, snwice_fmass 
+      !
+      INTEGER :: ierr,ierr4
       !!----------------------------------------------------------------------
       !
@@ -389 +390 @@
       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 )
+      ierr = ierr + ierr4
       !
       IF( lk_mpp    )   CALL mpp_sum( ierr )

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

@@ -81 +81 @@
       
       !
+      IF (kt == nn_it000 ) CALL sbc_ssm_init()
+
       IF( nn_timing == 1 )  CALL timing_start( 'sbc_ssm')
 
@@ -100 +102 @@
       tsn(:,:,1,jp_tem) = sst_m(:,:)
       tsn(:,:,1,jp_sal) = sss_m(:,:)
+      IF ( nn_ice == 1 ) THEN
+         tsb(:,:,1,jp_tem) = sst_m(:,:)
+         tsb(:,:,1,jp_sal) = sss_m(:,:)
+      ENDIF
       ub (:,:,1       ) = ssu_m(:,:)
       vb (:,:,1       ) = ssv_m(:,:)
@@ -135 +141 @@
       TYPE(FLD_N) :: sn_usp, sn_vsp, sn_ssh
       !
-      NAMELIST/namsbc_ssm/cn_dir, ln_3d_uv, sn_tem, sn_sal, sn_usp, sn_vsp, sn_ssh
+      NAMELIST/namsbc_sas/cn_dir, ln_3d_uv, sn_tem, sn_sal, sn_usp, sn_vsp, sn_ssh
 
       !!----------------------------------------------------------------------
@@ -151 +157 @@
       !
       REWIND( numnam )                          ! read in namlist namsbc_ssm
-      READ  ( numnam, namsbc_ssm )
+      READ  ( numnam, namsbc_sas )
       !                                         ! store namelist information in an array
       !                                         ! Control print
       IF(lwp) THEN
          WRITE(numout,*)
-         WRITE(numout,*) 'sbc_ssm : standalone surface scheme '
+         WRITE(numout,*) 'sbc_sas : standalone surface scheme '
          WRITE(numout,*) '~~~~~~~~~~~ '
-         WRITE(numout,*) '   Namelist namsbc_ssm'
+         WRITE(numout,*) '   Namelist namsbc_sas'
          WRITE(numout,*)
       ENDIF
@@ -273 +279 @@
       ! so allocate enough of arrays to use
       !
+      ierr3 = 0
       jpm = MAX(jp_tem, jp_sal)
       ALLOCATE( tsn(jpi,jpj,1,jpm), STAT=ierr0 )
       ALLOCATE( ub(jpi,jpj,1)     , STAT=ierr1 )
       ALLOCATE( vb(jpi,jpj,1)     , STAT=ierr2 )
-      ierr = ierr0 + ierr1 + ierr2
+      IF ( nn_ice == 1 ) ALLOCATE( tsb(jpi,jpj,1,jpm), STAT=ierr3 )
+      ierr = ierr0 + ierr1 + ierr2 + ierr3
       IF( ierr > 0 ) THEN
          CALL ctl_stop('sbc_ssm_init: unable to allocate surface arrays')