Changeset 12704


Ignore:
Timestamp:
2020-04-07T16:49:46+02:00 (7 months ago)
Author:
laurent
Message:

Fixes so STATION_ASF works fine!

Location:
NEMO/branches/2020/r12581_ticket2418/tests/STATION_ASF
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r12581_ticket2418/tests/STATION_ASF/EXPREF/launch_sasf.sh

    r12623 r12704  
    3434 
    3535if [ ! -f ${NEMO_EXE} ]; then echo " Mhhh, no compiled nemo.exe found into ${NEMO_DIR}/tests/STATION_ASF/BLD/bin !"; exit; fi 
     36 
     37echo 
     38echo " *** Using the following NEMO executable:" 
     39echo "  ${NEMO_EXE} " 
     40echo 
     41 
    3642 
    3743NEMO_EXPREF="${NEMO_DIR}/tests/STATION_ASF/EXPREF" 
  • NEMO/branches/2020/r12581_ticket2418/tests/STATION_ASF/MY_SRC/step_c1d.F90

    r12655 r12704  
    7878      ! Control and restarts 
    7979      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    80       CALL stp_ctl( kstp, Nbb, Nnn ) 
     80      CALL stp_ctl( kstp, Nnn ) 
     81 
    8182      IF( kstp == nit000 )   CALL iom_close( numror )          ! close input  ocean restart file 
    8283      IF( lrst_oce       )   CALL rst_write( kstp, Nbb, Nnn )  ! write output ocean restart file 
  • NEMO/branches/2020/r12581_ticket2418/tests/STATION_ASF/MY_SRC/stpctl.F90

    r12685 r12704  
    142142            IF( lwm .AND. kt /= nitend )   istatus = NF90_CLOSE(nrunid) 
    143143            ! get global loc on the min/max 
    144             CALL mpp_maxloc( 'stpctl',      vt_i(:,:)            , tmask(:,:,1), zzz, iloc(1:2,1) )   ! mpp_maxloc ok if mask = F  
    145             CALL mpp_maxloc( 'stpctl',ABS( u_ice(:,:) )          , tmask(:,:,1), zzz, iloc(1:2,2) ) 
    146             CALL mpp_minloc( 'stpctl',      tm_i(:,:) - 273.15_wp, tmask(:,:,1), zzz, iloc(1:2,3) ) 
     144            CALL mpp_maxloc( 'stpctl',    taum(:,:)            , tmask(:,:,1), zzz, iloc(1:2,1) )   ! mpp_maxloc ok if mask = F  
     145            CALL mpp_maxloc( 'stpctl',ABS( qns(:,:) )          , tmask(:,:,1), zzz, iloc(1:2,2) ) 
     146            CALL mpp_minloc( 'stpctl',     emp(:,:) - 273.15_wp, tmask(:,:,1), zzz, iloc(1:2,3) ) 
    147147            ! find which subdomain has the max. 
    148148            zarea(:) = 0._wp 
     
    153153         ELSE                    ! find local min and max locations: 
    154154            ! if we are here, this means that the subdomain contains some oce points -> no need to test the mask used in maxloc 
    155             iloc(1:2,1) = MAXLOC(       vt_i(:,:)            , mask = llmsk ) + (/ nimpp - 1, njmpp - 1/) 
    156             iloc(1:2,2) = MAXLOC( ABS( u_ice(:,:) )          , mask = llmsk ) + (/ nimpp - 1, njmpp - 1/) 
    157             iloc(1:2,3) = MINLOC(       tm_i(:,:) - 273.15_wp, mask = llmsk ) + (/ nimpp - 1, njmpp - 1/) 
     155            iloc(1:2,1) = MAXLOC(     taum(:,:)            , mask = llmsk ) + (/ nimpp - 1, njmpp - 1/) 
     156            iloc(1:2,2) = MAXLOC( ABS( qns(:,:) )          , mask = llmsk ) + (/ nimpp - 1, njmpp - 1/) 
     157            iloc(1:2,3) = MINLOC(      emp(:,:) - 273.15_wp, mask = llmsk ) + (/ nimpp - 1, njmpp - 1/) 
    158158            zarea(:) = narea     ! this is local information 
    159159         ENDIF 
Note: See TracChangeset for help on using the changeset viewer.