Index: /issm/trunk-jpl/examples/Greenland/runme.m =================================================================== --- /issm/trunk-jpl/examples/Greenland/runme.m (revision 21127) +++ /issm/trunk-jpl/examples/Greenland/runme.m (revision 21128) @@ -210,4 +210,17 @@ if any(steps==8) + disp(' Step 8: Plotting exercise'); + md = loadmodel('./Models/Greenland.HistoricTransient_200yr'); + figure + surfmb=[]; for i=2:201; surfmb=[surfmb ... + md.results.TransientSolution(i).SmbMassBalance]; end + subplot(3,1,1); plot([1:200],mean(surfmb)); + title('Mean Surface mass balance'); + vel=[]; for i=2:201; vel=[vel md.results.TransientSolution(i).Vel]; end + subplot(3,1,2); plot([1:200],mean(vel)); + title('Mean Velocity'); + volume=[]; for i=2:201; volume=[volume md.results.TransientSolution(i).IceVolume]; end + subplot(3,1,3); plot([1:200],volume); + title('Ice Volume'); xlabel('years'); disp(' Step 8: Plotting exercise'); Index: /issm/trunk-jpl/examples/Inversion/runme.m =================================================================== --- /issm/trunk-jpl/examples/Inversion/runme.m (revision 21127) +++ /issm/trunk-jpl/examples/Inversion/runme.m (revision 21128) @@ -1,4 +1,4 @@ step=1; -if step==1 +if any(step==1) %Generate observations md = model; @@ -13,5 +13,5 @@ save model1 md end -if step==2 +if any(step==2) %Modify rheology, now constant loadmodel('model1.mat'); @@ -29,5 +29,5 @@ save model2 md end -if step==3 +if any(step==3) %invert for ice rigidity loadmodel('model2.mat'); @@ -49,5 +49,5 @@ 'data',md.results.StressbalanceSolution.Vel,'title','modeled velocities') end -if step==4 +if any(step==4) %invert for ice rigidity loadmodel('model2.mat'); Index: /issm/trunk-jpl/examples/Pig/runme.m =================================================================== --- /issm/trunk-jpl/examples/Pig/runme.m (revision 21127) +++ /issm/trunk-jpl/examples/Pig/runme.m (revision 21128) @@ -1,5 +1,5 @@ step=[1]; -if step==1 %Mesh Generation #1 +if any(step==1) %Mesh Generation #1 %Mesh parameters domain =['./DomainOutline.exp']; @@ -57,5 +57,5 @@ end -if step==2 %Masks #2 +if any(step==2) %Masks #2 md = loadmodel('./Models/PIG_Mesh_generation'); @@ -86,5 +86,5 @@ end -if step==3 %Parameterization #3 +if any(step==3) %Parameterization #3 md = loadmodel('./Models/PIG_SetMask'); @@ -98,5 +98,5 @@ end -if step==4 %Control Method #4 +if any(step==4) %Control Method #4 md = loadmodel('./Models/PIG_Parameterization'); @@ -141,5 +141,5 @@ end -if step==5 %Plot #5 +if any(step==5) %Plot #5 md = loadmodel('./Models/PIG_Control_drag'); @@ -158,5 +158,5 @@ end -if step==6 %Higher-Order #6 +if any(step==6) %Higher-Order #6 % Load Model @@ -174,5 +174,5 @@ end -if step==7 %Plot #7 +if any(step==7) %Plot #7 mdHO = loadmodel('./Models/PIG_ModelHO'); Index: /issm/trunk-jpl/examples/PigSensitivity/runme.m =================================================================== --- /issm/trunk-jpl/examples/PigSensitivity/runme.m (revision 21127) +++ /issm/trunk-jpl/examples/PigSensitivity/runme.m (revision 21128) @@ -1,5 +1,5 @@ step=[1]; -if step==1 %Transient Run #1 +if any(step==1) %Transient Run #1 md = loadmodel('../Pig/Models/PIG_Control_drag'); @@ -26,5 +26,5 @@ end -if step==2 %High Melt #2 +if any(step==2) %High Melt #2 md = loadmodel('./Models/PIG_Transient'); @@ -41,5 +41,5 @@ end -if step==3 %Ice Front retreat +if any(step==3) %Ice Front retreat md = loadmodel('./Models/PIG_Transient'); @@ -60,5 +60,5 @@ end -if step==4 %High surface mass balance #3 +if any(step==4) %High surface mass balance #3 %Load model Index: /issm/trunk-jpl/jenkins/jenkins.sh =================================================================== --- /issm/trunk-jpl/jenkins/jenkins.sh (revision 21127) +++ /issm/trunk-jpl/jenkins/jenkins.sh (revision 21128) @@ -211,6 +211,7 @@ #matlab tests +# {{{ if [ $MATLAB_TEST -eq 1 ]; then -#Launch all tests on different cpus {{{ +#Launch all tests on different cpus for (( i=1;i<=$NUMCPUS_RUN;i++ )) do @@ -286,10 +287,11 @@ #filter out windows characters: cat matlab_log.log | tr -cd '\11\12\40-\176' > matlab_log.log2 && mv matlab_log.log2 matlab_log.log -#}}} -fi +fi +# }}} #python tests +# {{{ if [ $PYTHON_TEST -eq 1 ]; then -#Launch all tests on different cpus {{{ +#Launch all tests on different cpus PYTHON_START_TIME=$(timer); export PYTHONSTARTUP=$ISSM_DIR/src/m/dev/devpath.py @@ -318,7 +320,9 @@ cat python_log$i.log >> python_log.log done -#}}} -fi - +fi +# }}} + +# Examples Test +# {{{ # This test will allow us to check on the status of the examples. if [ $EXAMPLES_TEST -eq 1 ]; @@ -349,4 +353,39 @@ $SED -i.bak 's/steps=\[1\];/steps=\[1:8\];\n\ntry\n/' $FILE $SED -i.bak "s/if any(steps==8)/&${STEP_EIGHT}/" $FILE + elif [ "${dir}" == "./IceBridge" ]; + then + $SED -i.bak 's/steps=\[1\];/steps=\[1:5\];\n\ntry\n/' $FILE + elif [ "${dir}" == "./IceFlowModels" ]; + then + # Almost nothing to this example + $SED -i.bak '1 s/^.*$/try\n\n&/' $FILE + elif [ "${dir}" == "./Inversion" ]; + then + $SED -i.bak 's/steps=\[1\];/steps=\[1:4\];\n\ntry\n/' $FILE + elif [ "${dir}" == "./Jakobshavn" ]; + then + $SED -i.bak 's/steps=\[1\];/steps=\[1:4\];\n\ntry\n/' $FILE + elif [ "${dir}" == "./Jakobshavn" ]; + then + $SED -i.bak 's/steps=\[1\];/steps=\[1:4\];\n\ntry\n/' $FILE + elif [ "${dir}" == "./Pig" ]; + then + # Step 6 is needed + STEP_SIX="\n disp('Needs work!')" + $SED -i.bak 's/steps=\[1\];/steps=\[1:7\];\n\ntry\n/' $FILE + $SED -i.bak "s/if any(steps==6)/&${STEP_SIX}/" $FILE + elif [ "${dir}" == "./PigSensitivity" ]; + then + # Step 4 is needed + STEP_FOUR="\n disp('Needs work!')" + $SED -i.bak 's/steps=\[1\];/steps=\[1:4\];\n\ntry\n/' $FILE + $SED -i.bak "s/if any(steps==6)/&${STEP_FOUR}/" $FILE + elif [ "${dir}" == "./SquareIceShelf" ]; + then + # Almost nothing to this example + $SED -i.bak '1 s/^.*$/try\n\n&/' $FILE + elif [ "${dir}" == "./UncertaintyQuantification" ]; + then + $SED -i.bak 's/steps=\[1\];/steps=\[1:7\];\n\ntry\n/' $FILE else echo "Not implemented yet!" @@ -375,4 +414,5 @@ done fi +# }}} #process logs to be junit compatible