Context Navigation

Changeset 15694

Timestamp:

2022-02-04T16:00:09+01:00 (2 years ago)

Author:

jpalmier

Message:

Update files to enable next external update (MEDUSA in UKESM no coupled)

Location:

NEMO/branches/UKMO/NEMO_4.0.4_MEDUSA_externals_GC5

Files:

Property svn:externals

-                      old
+                      new
 ^/vendors/FCM@10134           ext/FCM
 ^/vendors/IOIPSL@9655         ext/IOIPSL
 https://code.metoffice.gov.uk/svn/medusa/main/trunk/src/MEDUSA@297 src/TOP/MEDUSA
 https://code.metoffice.gov.uk/svn/medusa/main/trunk/cfgs/ORCA2_MEDUSA@295 cfgs/ORCA2_MEDUSA
 https://code.metoffice.gov.uk/svn/medusa/main/trunk/cfgs/SHARED_MEDUSA@294 cfgs/SHARED_MEDUSA
+#https://code.metoffice.gov.uk/svn/medusa/main/trunk/src/MEDUSA@297 src/TOP/MEDUSA
+#https://code.metoffice.gov.uk/svn/medusa/main/trunk/cfgs/ORCA2_MEDUSA@295 cfgs/ORCA2_MEDUSA
+#https://code.metoffice.gov.uk/svn/medusa/main/trunk/cfgs/SHARED_MEDUSA@294 cfgs/SHARED_MEDUSA
 # SETTE mapping (inactive)

-                      r15662
+                      r15694
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   rnf_tsc_b, rnf_tsc  !: before and now T & S runoff contents   [K.m/s & PSU.m/s]
+   TYPE(FLD),        ALLOCATABLE, DIMENSION(:) ::   sf_rnf       ! structure: river runoff (file information, fields read)
+   !! IJT 19129 make sf_rnf PUBLIC - SAVE so it can be used in air_sea.F90
+   TYPE(FLD), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:)    ::   sf_rnf       ! structure: river runoff (file information, fields read)
    TYPE(FLD),        ALLOCATABLE, DIMENSION(:) ::   sf_i_rnf     ! structure: iceberg flux (file information, fields read)
    TYPE(FLD),        ALLOCATABLE, DIMENSION(:) ::   sf_s_rnf     ! structure: river runoff salinity (file information, fields read)

-                      r14075
+                      r15694
             zfact = 0.5_wp
             DO jn = 1, jptra
+               CALL iom_get( numrtr, jpdom_autoglo, 'sbc_'//TRIM(ctrcnm(jn))//'_b', sbc_trc_b(:,:,jn) )   ! before tracer content sbc
+               IF( iom_varid( numrtr, 'sbc_'//TRIM(ctrcnm(jn))//'_b', ldstop = .FALSE. ) > 0 ) THEN
+                  !! Jpalm -- ZMP -- need to read restart without oithona
+                  !! ZMP is here :
+                  CALL iom_get( numrtr, jpdom_autoglo, 'sbc_'//TRIM(ctrcnm(jn))//'_b', sbc_trc_b(:,:,jn) )   ! before tracer content sbc
+               ELSE
+                  !! Jpalm -- ZMP -- not sure what's a reasonable value... try with 0
+                  IF(lwp) WRITE(numout,*) 'trc_sb ---> sbc_',TRIM(ctrcnm(jn)),'_b NOT in RESTART file '
+                  IF(lwp) WRITE(numout,*) '         -- Initialize to 0.0'
+                  sbc_trc_b(:,:,jn) = 0._wp
+               ENDIF
             END DO
          ELSE                                         ! No restart or restart not found: Euler forward time stepping

Note: See TracChangeset for help on using the changeset viewer.