Commit 246f7518 authored by Jade Skye's avatar Jade Skye
Browse files

Resolve metOrder path merge conflict between 'develop' and 'preReleaseV2'.

parents 5e5579dd 03833eef

.gitlab-ci-build.yml

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ workflow: 


before_script:

 - source /home/scrd530/.profile

 - source $CCCMA_REF/env_setup_file



stages:

 - report_configuration

.gitlab-ci-run.yml

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ workflow: 


before_script:

 - source /home/scrd530/.profile

 - source $CCCMA_REF/env_setup_file



stages:

 - report_configuration

.gitlab-ci.yml

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ workflow: 


before_script:

 - source /home/scrd530/.profile

 - source $CCCMA_REF/env_setup_file



stages:

 - model_builds
@@ -121,6 +120,10 @@ perform_runs:parallel_intel_global_debug_build: 
        BUILD: "parallel_intel_global_debug_build"

        MODE: "parallel_intel"

        PARAMS: "domain=global runStartYear=1701 runEndYear=1703 Ncycle_on=.true. fertilizeron=.true. depositionon=.true."

      - RUN: "parallel_intel_global_debug_Random_metOrder"

        BUILD: "parallel_intel_global_debug_build"

        MODE: "parallel_intel"

        PARAMS: "domain=global runStartYear=1701 runEndYear=1703 metOrder=random"

      # - RUN: "parallel_intel_global_debug_CLASS"

      #   BUILD: "parallel_intel_global_debug_build"

      #   MODE: "parallel_intel"

src/base/nallocate.f90

+3 −0
Original line number Diff line number Diff line
@@ -446,6 +446,9 @@ subroutine nallocate(il1, il2, fcancmx, lfstatus, sort, ailcg, & ! In 
                        ns_s2sr = nstemmass_ns(i,j) / temp_reallocation_onset

                        ns_r2sr = nrootmass_ns(i,j) / temp_reallocation_onset

                        temp_reallocation_onset = 0.0

                      else

                        ns_s2sr = 1.0E20 ! some suitably large number

                        ns_r2sr = 1.0E20

                     end if



                      if (nstemns2t > min_ns2t_s(sort(j)) &

tools/regression_testing/sleepcheck.sh

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ sleep 20 
let sleepcount=1 # Index starting at 1, as 'let' returns exit status of 1 (failure) when it evaluated to 0 (as when =0) which kills the script when 'set -e' is present.

while [ $sleepcount -lt 1081 ] ; # Increase from 1080 to 1081 for reason stated above.

do

  status=$( jobst -c $HDNODE 2>/dev/null | grep $1 | tr -s '|' ' ' | cut -d ' ' -f 3 )

  status=$( jobst -c $ORDENV_TRUEHOST 2>/dev/null | grep $1 | tr -s '|' ' ' | cut -d ' ' -f 3 )

  status=${status#*|}

  if [ "$status" == "Q" ]; then

    echo "Queued!" Count is $sleepcount
@@ -19,7 +19,7 @@ do 
    break

  else

    echo "Unexpected jobstat result (Count is $sleepcount):"

    echo $( jobst -c $HDNODE 2>/dev/null | grep $1 )

    echo $( jobst -c $ORDENV_TRUEHOST 2>/dev/null | grep $1 )

    let sleepcount=$sleepcount+1

  fi