New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 11953 for branches/UKMO – NEMO

Changeset 11953 for branches/UKMO


Ignore:
Timestamp:
2019-11-22T17:09:26+01:00 (4 years ago)
Author:
dcarneir
Message:

Compilation errors fixed in asminc.F90 and diaobs.F90

Location:
branches/UKMO/dev_r5518_obs_oper_update_sit/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_obs_oper_update_sit/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

    r11944 r11953  
    11951195!#endif 
    11961196 
     1197      ENDIF 
    11971198 
    11981199   END SUBROUTINE sit_asm_inc 
  • branches/UKMO/dev_r5518_obs_oper_update_sit/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

    r11929 r11953  
    13851385 
    13861386            CASE('sit') 
    1387               IF ( kstp == 0 ) THEN 
    1388                  IF ( lwp .AND. surfdataqc(jtype)%nsstpmpp(1) > 0 ) THEN 
    1389                     CALL ctl_warn( 'Sea-ice not initialised on zeroth '// & 
    1390                        &           'time-step but some obs are valid then.' ) 
    1391                     WRITE(numout,*)surfdataqc(jtype)%nsstpmpp(1), & 
    1392                        &           ' sea-ice thickness obs will be missed and QC flag set to 4' 
    1393                  ENDIF                                  
    1394               ELSE        
     1387               IF ( kstp == 0 ) THEN 
     1388                  IF ( lwp .AND. surfdataqc(jtype)%nsstpmpp(1) > 0 ) THEN 
     1389                     CALL ctl_warn( 'Sea-ice not initialised on zeroth '// & 
     1390                        &           'time-step but some obs are valid then.' ) 
     1391                     WRITE(numout,*)surfdataqc(jtype)%nsstpmpp(1), & 
     1392                        &           ' sea-ice thickness obs will be missed and QC flag set to 4' 
     1393                  ENDIF                                  
     1394               ELSE        
    13951395#if defined key_cice 
    1396                  zsurfvar(:,:) = thick_i(:,:) 
     1396                  zsurfvar(:,:) = thick_i(:,:) 
    13971397#elif defined key_lim2 || defined key_lim3 
    1398                  CALL ctl_stop( ' No sea-ice thickness observation operator defined for LIM model' ) 
    1399 #else 
    1400                  CALL ctl_stop( ' Trying to run sea-ice thickness observation operator', & 
    1401                   &           ' but no sea-ice model appears to have been defined' ) 
    1402 #endif 
     1398                  CALL ctl_stop( ' No sea-ice thickness observation operator defined for LIM model' ) 
     1399#else 
     1400                  CALL ctl_stop( ' Trying to run sea-ice thickness observation operator', & 
     1401                     &           ' but no sea-ice model appears to have been defined' ) 
     1402#endif 
     1403               ENDIF 
    14031404 
    14041405            CASE('slchltot') 
Note: See TracChangeset for help on using the changeset viewer.